samtools / htslib-plugins

Plugins for use with HTSlib
Other
9 stars 7 forks source link

irods init_client_api_table deprecation #4

Open mcshane opened 3 years ago

mcshane commented 3 years ago

init_client_api_table appears to be deprecated and replaced by load_client_api_plugins.


index 092c575..0b4e05a 100644
--- a/hfile_irods.c
+++ b/hfile_irods.c
@@ -56,9 +56,9 @@ DEALINGS IN THE SOFTWARE.  */
 #define PRIORITY (10 * IRODS_VERSION_MAJOR) + IRODS_VERSION_MINOR
 #else
 #define PRIORITY 30
-// For iRODS 3.x, there is no init_client_api_table() to call and clientLogin()
+// For iRODS 3.x, there is no load_client_api_plugins() to call and clientLogin()
 // has fewer parameters.  Define wrappers so the 4.x-style code below compiles.
-static void init_client_api_table() { }
+static void load_client_api_plugins() { }
 #define clientLogin(conn, x, y) (clientLogin((conn)))
 #endif

@@ -135,7 +135,7 @@ static int irods_init()
     // state (by default, termination; or as already set by our caller).
     pipehandler_ret = sigaction(SIGPIPE, NULL, &pipehandler);

-    init_client_api_table();
+    load_client_api_plugins();
     irods.conn = rcConnect(irods.env.rodsHost, irods.env.rodsPort,
                            irods.env.rodsUserName, irods.env.rodsZone,
                            NO_RECONN, &err);```