ctdb-include: Group function prototypes from server/ctdb_logging.c

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/include/ctdb_logging.h b/ctdb/include/ctdb_logging.h
index c419e85d77b157778b48db90c14e520531f8f303..2444547d0b40d76e4ebdd55e41b6c1b0c1f5a41a 100644 (file)
--- a/ctdb/include/ctdb_logging.h
+++ b/ctdb/include/ctdb_logging.h
@@ -43,11 +43,6 @@ const char *get_debug_by_level(int32_t level);
 bool parse_debug(const char *str, int32_t *level);
 void print_debug_levels(FILE *stream);
 
-bool ctdb_logging_init(TALLOC_CTX *mem_ctx, const char *logging);
-typedef int (*ctdb_log_setup_fn_t)(TALLOC_CTX *mem_ctx,
-                                  const char *logging,
-                                  const char *app_name);
-void ctdb_log_register_backend(const char *prefix, ctdb_log_setup_fn_t init);
 void ctdb_log_init_file(void);
 void ctdb_log_init_syslog(void);
 

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 1333a9b73a64f597ddab78986435a2ba2ca07e79..7281acb1157918d60bbbadf06c4bbe4ea077dea0 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -1076,7 +1076,6 @@ int32_t ctdb_control_db_get_health(struct ctdb_context *ctdb,
 
 int32_t ctdb_monitoring_mode(struct ctdb_context *ctdb);
 bool ctdb_stopped_monitoring(struct ctdb_context *ctdb);
-int ctdb_set_child_logging(struct ctdb_context *ctdb);
 
 struct client_async_data {
        enum ctdb_controls opcode;
@@ -1128,16 +1127,6 @@ int ctdb_vacuum_init(struct ctdb_db_context *ctdb_db);
 int32_t ctdb_control_enable_script(struct ctdb_context *ctdb, TDB_DATA indata);
 int32_t ctdb_control_disable_script(struct ctdb_context *ctdb, TDB_DATA indata);
 
-struct ctdb_log_state *ctdb_vfork_with_logging(TALLOC_CTX *mem_ctx,
-                                              struct ctdb_context *ctdb,
-                                              const char *log_prefix,
-                                              const char *helper,
-                                              int helper_argc,
-                                              const char **helper_argv,
-                                              void (*logfn)(const char *, uint16_t, void *),
-                                              void *logfn_private, pid_t *pid);
-
-
 int32_t ctdb_control_get_db_seqnum(struct ctdb_context *ctdb,
                                   TDB_DATA indata,
                                   TDB_DATA *outdata);
@@ -1159,8 +1148,6 @@ int update_ip_assignment_tree(struct ctdb_context *ctdb,
                                struct ctdb_public_ip *ip);
 void clear_ip_assignment_tree(struct ctdb_context *ctdb);
 
-int ctdb_init_tevent_logging(struct ctdb_context *ctdb);
-
 int ctdb_statistics_init(struct ctdb_context *ctdb);
 
 int32_t ctdb_control_get_stat_history(struct ctdb_context *ctdb,
@@ -1416,4 +1403,27 @@ struct lock_request *ctdb_lock_alldb(TALLOC_CTX *mem_ctx,
                                     void (*callback)(void *, bool),
                                     void *private_data);
 
+/* from ctdb_logging.c */
+
+typedef int (*ctdb_log_setup_fn_t)(TALLOC_CTX *mem_ctx,
+                                  const char *logging,
+                                  const char *app_name);
+
+void ctdb_log_register_backend(const char *prefix, ctdb_log_setup_fn_t init);
+
+bool ctdb_logging_init(TALLOC_CTX *mem_ctx, const char *logging);
+
+struct ctdb_log_state *ctdb_vfork_with_logging(TALLOC_CTX *mem_ctx,
+                                              struct ctdb_context *ctdb,
+                                              const char *log_prefix,
+                                              const char *helper,
+                                              int helper_argc,
+                                              const char **helper_argv,
+                                              void (*logfn)(const char *,
+                                                            uint16_t, void *),
+                                              void *logfn_private, pid_t *pid);
+
+int ctdb_set_child_logging(struct ctdb_context *ctdb);
+int ctdb_init_tevent_logging(struct ctdb_context *ctdb);
+
 #endif