tree: Convert some functions into static

Turn some functions, which are only used inside a compilation unit, into
static. If the funtions was published in the include file, remove it
there.

mx_getopt.c

@@ -316,7 +316,7 @@ void mx_getopt_pop_current_argument(struct mx_getopt_ctl *optctl)
     optctl->_argc--;
 }
 
-void mx_getopt_pop_all_arguments(struct mx_getopt_ctl *optctl)
+static void mx_getopt_pop_all_arguments(struct mx_getopt_ctl *optctl)
 {
     while(optctl->optind < optctl->_argc)
         mx_getopt_pop_current_argument(optctl);

mx_mysql.c

@@ -46,6 +46,8 @@
 #define mx__mysql_stmt_log_info(stmt)  mx__mysql_stmt_log(info,  (stmt))
 #define mx__mysql_stmt_log_debug(stmt) mx__mysql_stmt_log(debug, (stmt))
 
+static struct mx_mysql_stmt *mx_mysql_statement_prepare_with_bindings(struct mx_mysql *mysql, char *statement, struct mx_mysql_bind *param, struct mx_mysql_bind *result);
+
 /**********************************************************************/
 
 static int mx__mysql_errno(struct mx_mysql *mysql)
@@ -62,7 +64,7 @@ static int mx__mysql_errno(struct mx_mysql *mysql)
     return (int)error;
 }
 
-const char *mx__mysql_error(struct mx_mysql *mysql)
+static const char *mx__mysql_error(struct mx_mysql *mysql)
 {
     mx_assert_return_NULL(mysql, EINVAL);
     mx_assert_return_NULL(mysql->mysql, EBADF);
@@ -71,7 +73,7 @@ const char *mx__mysql_error(struct mx_mysql *mysql)
     return mysql_error(mysql->mysql);
 }
 
-const char *mx__mysql_sqlstate(struct mx_mysql *mysql)
+static const char *mx__mysql_sqlstate(struct mx_mysql *mysql)
 {
     mx_assert_return_NULL(mysql, EINVAL);
     mx_assert_return_NULL(mysql->mysql, EBADF);
@@ -633,7 +635,7 @@ static int mx__mysql_library_end(void) {
 
 /**********************************************************************/
 
-int _mx_mysql_bind_integer(struct mx_mysql_bind *b, unsigned int index, void *value, int type, int is_unsigned)
+static int _mx_mysql_bind_integer(struct mx_mysql_bind *b, unsigned int index, void *value, int type, int is_unsigned)
 {
     mx_assert_return_minus_errno(b,     EINVAL);
     mx_assert_return_minus_errno(value, EINVAL);
@@ -726,7 +728,7 @@ int mx_mysql_initialize(struct mx_mysql **mysql)
     return 0;
 }
 
-int mx_mysql_init(struct mx_mysql *mysql)
+static int mx_mysql_init(struct mx_mysql *mysql)
 {
     int res;
 
@@ -863,11 +865,11 @@ int mx_mysql_disconnect(struct mx_mysql *mysql) {
     return mx__mysql_close(mysql);
 }
 
-int mx_mysql_end(void) {
+static int mx_mysql_end(void) {
     return mx__mysql_library_end();
 }
 
-int mx_mysql_free(struct mx_mysql **mysql)
+static int mx_mysql_free(struct mx_mysql **mysql)
 {
     mx_assert_return_minus_errno(mysql, EINVAL);
     mx_assert_return_minus_errno(*mysql, EBADF);
@@ -900,14 +902,14 @@ int mx_mysql_finish(struct mx_mysql **mysql)
 }
 
 
-int mx_mysql_ping(struct mx_mysql *mysql)
+static int mx_mysql_ping(struct mx_mysql *mysql)
 {
     mx_assert_return_minus_errno(mysql, EINVAL);
 
     return mx__mysql_ping(mysql);
 }
 
-int mx_mysql_ping_forever(struct mx_mysql *mysql)
+static int mx_mysql_ping_forever(struct mx_mysql *mysql)
 {
     int res;
     int fail = 0;
@@ -933,7 +935,7 @@ int mx_mysql_ping_forever(struct mx_mysql *mysql)
     return res;
 }
 
-int mx_mysql_statement_init(struct mx_mysql *mysql, struct mx_mysql_stmt **stmt)
+static int mx_mysql_statement_init(struct mx_mysql *mysql, struct mx_mysql_stmt **stmt)
 {
     struct mx_mysql_stmt *s;
     int res;
@@ -1085,7 +1087,7 @@ int mx_mysql_statement_field_count(struct mx_mysql_stmt *stmt)
     return mx__mysql_stmt_field_count(stmt);
 }
 
-int mx_mysql_stmt_field_count_set(struct mx_mysql_stmt *stmt)
+static int mx_mysql_stmt_field_count_set(struct mx_mysql_stmt *stmt)
 {
     mx_assert_return_minus_errno(stmt,       EINVAL);
     mx_assert_return_minus_errno(stmt->stmt, EBADF);
@@ -1095,7 +1097,7 @@ int mx_mysql_stmt_field_count_set(struct mx_mysql_stmt *stmt)
     return 0;
 }
 
-int mx_mysql_stmt_param_count_set(struct mx_mysql_stmt *stmt)
+static int mx_mysql_stmt_param_count_set(struct mx_mysql_stmt *stmt)
 {
     mx_assert_return_minus_errno(stmt,       EINVAL);
     mx_assert_return_minus_errno(stmt->stmt, EBADF);
@@ -1105,7 +1107,7 @@ int mx_mysql_stmt_param_count_set(struct mx_mysql_stmt *stmt)
     return 0;
 }
 
-int mx_mysql_bind_cleanup(struct mx_mysql_bind *bind)
+static int mx_mysql_bind_cleanup(struct mx_mysql_bind *bind)
 {
     if (!bind)
         return 0;
@@ -1118,7 +1120,7 @@ int mx_mysql_bind_cleanup(struct mx_mysql_bind *bind)
     return 0;
 }
 
-int mx_mysql_bind_init_from(struct mx_mysql_bind *bind, unsigned long count, enum mx_mysql_bind_type type, struct mx_mysql_bind *from)
+static int mx_mysql_bind_init_from(struct mx_mysql_bind *bind, unsigned long count, enum mx_mysql_bind_type type, struct mx_mysql_bind *from)
 {
     mx_assert_return_minus_errno(bind, EINVAL);
 
@@ -1253,7 +1255,7 @@ int mx_mysql_do_statement_retry_on_fail(struct mx_mysql *mysql, char *query, str
 }
 
 
-struct mx_mysql_stmt *mx_mysql_statement_prepare_with_bindings(struct mx_mysql *mysql, char *statement, struct mx_mysql_bind *param, struct mx_mysql_bind *result)
+static struct mx_mysql_stmt *mx_mysql_statement_prepare_with_bindings(struct mx_mysql *mysql, char *statement, struct mx_mysql_bind *param, struct mx_mysql_bind *result)
 {
     int res;
     struct mx_mysql_stmt *stmt = NULL;
@@ -1335,7 +1337,7 @@ int mx_mysql_statement_close_no_bind_cleanup(struct mx_mysql_stmt **stmt)
     return 0;
 }
 
-int mx_mysql_bind_integer(struct mx_mysql_bind *b, unsigned int index, void *value, int type, int is_unsigned)
+static int mx_mysql_bind_integer(struct mx_mysql_bind *b, unsigned int index, void *value, int type, int is_unsigned)
 {
     int res;
 

mx_mysql.h

@@ -98,9 +98,6 @@ struct mx_mysql_stmt {
 #define mx_mysql_statement_result_bind(s, i, t, p) mx_mysql_bind_var(&((s)->result), (i), t, (p))
 
 int mx_mysql_initialize(struct mx_mysql **mysql);
-int mx_mysql_init(struct mx_mysql *mysql);
-
-int mx_mysql_free(struct mx_mysql **mysql);
 
 int mx_mysql_option_set_default_file(struct mx_mysql *mysql, char *fname);
 int mx_mysql_option_set_default_group(struct mx_mysql *mysql, char *group);
@@ -112,14 +109,8 @@ int mx_mysql_connect_forever_sec(struct mx_mysql **mysql, unsigned int seconds);
 
 int mx_mysql_disconnect(struct mx_mysql *mysql);
 
-int mx_mysql_end(void);
-
 int mx_mysql_finish(struct mx_mysql **mysql);
 
-int mx_mysql_ping(struct mx_mysql *mysql);
-int mx_mysql_ping_forever(struct mx_mysql *mysql);
-
-
 #define mx_mysql_do_statement_noresult(m, q, p) \
         mx_mysql_do_statement(m, q, p, NULL, NULL, NULL, 0)
 
@@ -129,9 +120,7 @@ int mx_mysql_ping_forever(struct mx_mysql *mysql);
 int mx_mysql_do_statement(struct mx_mysql *mysql, char *query, struct mx_mysql_bind *param, struct mx_mysql_bind *result, void *from, void **to, size_t size);
 int mx_mysql_do_statement_retry_on_fail(struct mx_mysql *mysql, char *query, struct mx_mysql_bind *param, struct mx_mysql_bind *result, void *from, void **to, size_t size);
 
-int mx_mysql_statement_init(struct mx_mysql *mysql, struct mx_mysql_stmt **stmt);
 struct mx_mysql_stmt *mx_mysql_statement_prepare(struct mx_mysql *mysql, char *statement);
-struct mx_mysql_stmt *mx_mysql_statement_prepare_with_bindings(struct mx_mysql *mysql, char *statement, struct mx_mysql_bind *param, struct mx_mysql_bind *result);
 int mx_mysql_statement_execute(struct mx_mysql_stmt *stmt, unsigned long long *count);
 
 int mx_mysql_statement_insert_id(struct mx_mysql_stmt *stmt, unsigned long long int *id);

mxq_group.c

@@ -126,7 +126,7 @@ void mxq_group_free_content(struct mxq_group *g)
 }
 
 
-uint64_t mxq_group_jobs_done(struct mxq_group *g)
+static uint64_t mxq_group_jobs_done(struct mxq_group *g)
 {
     uint64_t done = 0;
 

mxq_group.h

@@ -67,7 +67,6 @@ struct mxq_group {
 
 void mxq_group_free_content(struct mxq_group *g);
 
-uint64_t mxq_group_jobs_done(struct mxq_group *g);
 uint64_t mxq_group_jobs_active(struct mxq_group *g);
 uint64_t mxq_group_jobs_inq(struct mxq_group *g);
 

mxq_job.c

@@ -279,7 +279,7 @@ int mxq_load_jobs_in_group_with_status(struct mx_mysql *mysql, struct mxq_job **
     return res;
 }
 
-uint64_t mxq_select_job_from_group(struct mx_mysql *mysql, uint64_t group_id)
+static uint64_t mxq_select_job_from_group(struct mx_mysql *mysql, uint64_t group_id)
 {
     struct mx_mysql_bind param  = {0};
     struct mx_mysql_bind result = {0};
@@ -326,7 +326,7 @@ uint64_t mxq_select_job_from_group(struct mx_mysql *mysql, uint64_t group_id)
     return(job_id);
 }
 
-int mxq_assign_job_from_group_to_daemon(struct mx_mysql *mysql, uint64_t group_id, struct mxq_daemon *daemon, unsigned long slots_per_job)
+static int mxq_assign_job_from_group_to_daemon(struct mx_mysql *mysql, uint64_t group_id, struct mxq_daemon *daemon, unsigned long slots_per_job)
 {
     struct mx_mysql_bind param = {0};
     int res;
@@ -423,7 +423,7 @@ int mxq_unassign_jobs_of_server(struct mx_mysql *mysql, struct mxq_daemon *daemo
     return res;
 }
 
-int mxq_set_job_status_loaded_on_server(struct mx_mysql *mysql, struct mxq_job *job)
+static int mxq_set_job_status_loaded_on_server(struct mx_mysql *mysql, struct mxq_job *job)
 {
     struct mx_mysql_bind param = {0};
     char *host_id;
@@ -676,7 +676,7 @@ int mxq_job_set_tmpfilenames(struct mxq_group *g, struct mxq_job *j)
     return 1;
 }
 
-int mxq_load_job_from_group_assigned_to_daemon(struct mx_mysql *mysql, struct mxq_job **jobs_result, uint64_t group_id, struct mxq_daemon *daemon)
+static int mxq_load_job_from_group_assigned_to_daemon(struct mx_mysql *mysql, struct mxq_job **jobs_result, uint64_t group_id, struct mxq_daemon *daemon)
 {
     struct mxq_job *jobs_tmp = NULL;
     struct mx_mysql_bind param = {0};

mxq_job.h

@@ -86,14 +86,11 @@ void mxq_job_free_content(struct mxq_job *j);
 int mxq_load_job(struct mx_mysql *mysql, struct mxq_job **mxq_jobs, uint64_t job_id);
 int mxq_load_jobs_in_group(struct mx_mysql *mysql, struct mxq_job **mxq_jobs, struct mxq_group *grp);
 int mxq_load_jobs_in_group_with_status(struct mx_mysql *mysql, struct mxq_job **mxq_jobs, struct mxq_group *grp, uint64_t job_status);
-int mxq_assign_job_from_group_to_daemon(struct mx_mysql *mysql, uint64_t group_id, struct mxq_daemon *daemon, unsigned long slots_per_job);
 int mxq_unassign_jobs_of_server(struct mx_mysql *mysql, struct mxq_daemon *daemon);
-int mxq_set_job_status_loaded_on_server(struct mx_mysql *mysql, struct mxq_job *job);
 int mxq_set_job_status_running(struct mx_mysql *mysql, struct mxq_job *job);
 int mxq_set_job_status_exited(struct mx_mysql *mysql, struct mxq_job *job);
 int mxq_set_job_status_unknown(struct mx_mysql *mysql, struct mxq_job *job);
 int mxq_job_set_tmpfilenames(struct mxq_group *g, struct mxq_job *j);
-int mxq_load_job_from_group_assigned_to_daemon(struct mx_mysql *mysql, struct mxq_job **jobs_result, uint64_t group_id, struct mxq_daemon *daemon);
 int mxq_load_job_from_group_for_daemon(struct mx_mysql *mysql, struct mxq_job *mxqjob, uint64_t group_id, struct mxq_daemon *daemon,unsigned long slots_per_job);
 int mxq_load_jobs_running_on_server(struct mx_mysql *mysql, struct mxq_job **jobs_result, struct mxq_daemon *daemon);
 int mxq_unload_job_from_server(struct mx_mysql *mysql, struct mxq_daemon *daemon, uint64_t job_id);