change the libctdb_ prefix to ctdb_

diff --git a/include/ctdb.h b/include/ctdb.h
index d3c0d79ec4f80784a14b0e9636175f87c6e04686..dd5361c1782b0e1adb117e0ca33ffd13a5f75812 100644 (file)
--- a/include/ctdb.h
+++ b/include/ctdb.h
@@ -20,40 +20,41 @@
 #ifndef _CTDB_H
 #define _CTDB_H
 
-/* all functions except libctdb_connect() and libctdb_service()
- * are non-blocking
- */
-
-struct ctdb_context *libctdb_connect(const char *addr);
+struct ctdb_context *ctdb_connect(const char *addr);
 
-int libctdb_get_fd(struct ctdb_context *ctdb);
+int ctdb_get_fd(struct ctdb_context *ctdb);
 
-int libctdb_which_events(struct ctdb_context *ctdb);
+int ctdb_which_events(struct ctdb_context *ctdb);
 
-int libctdb_service(struct ctdb_context *ctdb);
+int ctdb_service(struct ctdb_context *ctdb);
 
 
 
-typedef void libctdb_handle;
+typedef void ctdb_handle;
 
 
-typedef void (*get_recmaster_cb)(int32_t status, int32_t recmaster, void *private_data);
+/*
+ * function to cancel a request/call
+ */
+int ctdb_cancel(ctdb_handle *);
 
 
+/*
+ * functions to read the recovery master of a node
+ */
+typedef void (*get_recmaster_cb)(int32_t status, int32_t recmaster, void *private_data);
 
-libctdb_handle *
-libctdb_getrecmaster_send(struct ctdb_context *ctdb,
+ctdb_handle *
+ctdb_getrecmaster_send(struct ctdb_context *ctdb,
                        uint32_t destnode,
                        get_recmaster_cb callback,
                        void *private_data);
-int libctdb_getrecmaster_recv(struct ctdb_context *ctdb,
-                       libctdb_handle *handle,
+int ctdb_getrecmaster_recv(struct ctdb_context *ctdb,
+                       ctdb_handle *handle,
                        uint32_t *recmaster);
-int libctdb_getrecmaster(struct ctdb_context *ctdb,
+int ctdb_getrecmaster(struct ctdb_context *ctdb,
                        uint32_t destnode,
                        uint32_t *recmaster);
 
 
-int libctdb_cancel(libctdb_handle *);
-
 #endif

diff --git a/libctdb/libctdb.c b/libctdb/libctdb.c
index a44e3c9cebd6c67cfc294c84339139d0846b4e8b..40369be36b8dd365bdb421aaaf4356d89d002151 100644 (file)
--- a/libctdb/libctdb.c
+++ b/libctdb/libctdb.c
@@ -26,7 +26,7 @@
 #include "include/ctdb_protocol.h"
 #include "include/ctdb_private.h"
 
-struct ctdb_context *libctdb_connect(const char *addr)
+struct ctdb_context *ctdb_connect(const char *addr)
 {
        struct event_context *ev;
        struct ctdb_context *ctdb;
@@ -59,12 +59,12 @@ struct ctdb_context *libctdb_connect(const char *addr)
 }
 
 
-int libctdb_get_fd(struct ctdb_context *ctdb)
+int ctdb_get_fd(struct ctdb_context *ctdb)
 {
        return ctdb->daemon.sd;
 }
 
-int libctdb_which_events(struct ctdb_context *ctdb)
+int ctdb_which_events(struct ctdb_context *ctdb)
 {
        if (ctdb_queue_length(ctdb->daemon.queue) > 0) {
                return POLLIN|POLLOUT;
@@ -117,7 +117,7 @@ struct ctdb_context *ctdb_init(struct event_context *ev)
  * we probably need a new event function to handle these timed events
  * event_loop_all_queued() or similar
  */
-int libctdb_service(struct ctdb_context *ctdb)
+int ctdb_service(struct ctdb_context *ctdb)
 {
        int ret;
 
@@ -129,21 +129,21 @@ int libctdb_service(struct ctdb_context *ctdb)
 
 
 
-int libctdb_cancel(libctdb_handle *handle)
+int ctdb_cancel(ctdb_handle *handle)
 {
        talloc_free(handle);
        return 0;
 }
 
-struct libctdb_control_cb_data {
+struct ctdb_control_cb_data {
        void *callback;
        void *private_data;
 };
 
 static void
-libctdb_getrecmaster_recv_cb(struct ctdb_client_control_state *state)
+ctdb_getrecmaster_recv_cb(struct ctdb_client_control_state *state)
 {
-       struct libctdb_control_cb_data *cb_data = state->async.private_data;
+       struct ctdb_control_cb_data *cb_data = state->async.private_data;
        get_recmaster_cb callback = (get_recmaster_cb)cb_data->callback;
 
        callback(0, state->status, cb_data->private_data);
@@ -153,32 +153,32 @@ libctdb_getrecmaster_recv_cb(struct ctdb_client_control_state *state)
 /*
   get the recovery master of a remote node
  */
-libctdb_handle *
-libctdb_getrecmaster_send(struct ctdb_context *ctdb,
+ctdb_handle *
+ctdb_getrecmaster_send(struct ctdb_context *ctdb,
                        uint32_t destnode,
                        get_recmaster_cb callback,
                        void *private_data)
 {
        struct ctdb_client_control_state *state;
-       struct libctdb_control_cb_data *cb_data;
+       struct ctdb_control_cb_data *cb_data;
 
        state = ctdb_control_send(ctdb, destnode, 0, 
                           CTDB_CONTROL_GET_RECMASTER, 0, tdb_null, 
                           ctdb, NULL, NULL);
 
        if (callback != NULL) {
-               cb_data = talloc(state, struct libctdb_control_cb_data);
+               cb_data = talloc(state, struct ctdb_control_cb_data);
                cb_data->callback     = callback;
                cb_data->private_data = private_data;
 
-               state->async.fn           = libctdb_getrecmaster_recv_cb;
+               state->async.fn           = ctdb_getrecmaster_recv_cb;
                state->async.private_data = cb_data;
        }
 
-       return (libctdb_handle *)state;
+       return (ctdb_handle *)state;
 }
 
-int libctdb_getrecmaster_recv(struct ctdb_context *ctdb, libctdb_handle *handle, uint32_t *recmaster)
+int ctdb_getrecmaster_recv(struct ctdb_context *ctdb, ctdb_handle *handle, uint32_t *recmaster)
 {
        struct ctdb_client_control_state *state = talloc_get_type(handle, struct ctdb_client_control_state);
        int ret;
@@ -186,7 +186,7 @@ int libctdb_getrecmaster_recv(struct ctdb_context *ctdb, libctdb_handle *handle,
 
        ret = ctdb_control_recv(ctdb, state, state, NULL, &res, NULL);
        if (ret != 0) {
-               DEBUG(DEBUG_ERR,(__location__ " libctdb_getrecmaster_recv failed\n"));
+               DEBUG(DEBUG_ERR,(__location__ " ctdb_getrecmaster_recv failed\n"));
                return -1;
        }
 
@@ -197,17 +197,17 @@ int libctdb_getrecmaster_recv(struct ctdb_context *ctdb, libctdb_handle *handle,
        return 0;
 }
 
-int libctdb_getrecmaster(struct ctdb_context *ctdb, uint32_t destnode, uint32_t *recmaster)
+int ctdb_getrecmaster(struct ctdb_context *ctdb, uint32_t destnode, uint32_t *recmaster)
 {
        struct ctdb_client_control_state *state;
        
-       state = libctdb_getrecmaster_send(ctdb, destnode, NULL, recmaster);
+       state = ctdb_getrecmaster_send(ctdb, destnode, NULL, recmaster);
        if (state == NULL) {
-               DEBUG(DEBUG_ERR,(__location__ " libctdb_getrecmaster_send() failed.\n"));
+               DEBUG(DEBUG_ERR,(__location__ " ctdb_getrecmaster_send() failed.\n"));
                return -1;
        }
 
-       return libctdb_getrecmaster_recv(ctdb, state, recmaster);
+       return ctdb_getrecmaster_recv(ctdb, state, recmaster);
 }
 
 

diff --git a/libctdb/tst.c b/libctdb/tst.c
index 251c3768413bd17da0b15e80664489cf9cd49278..c6dde12c247629bd87c6cd3e369b0cabe41c991f 100644 (file)
--- a/libctdb/tst.c
+++ b/libctdb/tst.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <poll.h>
-#include "include/libctdb.h"
+#include "include/ctdb.h"
 
 
 void rm_cb(int32_t status, int32_t recmaster, void *private_data)
@@ -15,20 +15,20 @@ int main(int argc, char *argv[])
        struct ctdb_client_control_state *state;
        struct pollfd pfd;
 
-       ctdb_context = libctdb_connect("/tmp/ctdb.socket");
+       ctdb_context = ctdb_connect("/tmp/ctdb.socket");
 
 
-       pfd.fd = libctdb_get_fd(ctdb_context);
+       pfd.fd = ctdb_get_fd(ctdb_context);
 
-       state = libctdb_getrecmaster_send(ctdb_context, 0, rm_cb, NULL);
+       state = ctdb_getrecmaster_send(ctdb_context, 0, rm_cb, NULL);
 
        for (;;) {
-         pfd.events = libctdb_which_events(ctdb_context);
+         pfd.events = ctdb_which_events(ctdb_context);
          if (poll(&pfd, 1, -1) < 0) {
            printf("Poll failed");
            exit(10);
          }
-         libctdb_service(ctdb_context);
+         ctdb_service(ctdb_context);
        }
 
        return 0;