From 4aee7d5372465dbb363f95727f0e2fa60233caf9 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Thu, 19 Nov 2015 17:16:05 +0100 Subject: [PATCH] mx_log: Fix format errors and type length --- Makefile | 1 + mx_log.h | 2 +- mx_mysql.c | 10 +++++----- mxqadmin.c | 6 +++--- mxqd.c | 14 +++++++------- mxqdump.c | 10 +++++----- mxqkill.c | 2 +- mxqsub.c | 2 +- 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index d50a02ad..5675048b 100644 --- a/Makefile +++ b/Makefile @@ -611,6 +611,7 @@ clean: CLEAN += test_mx_util test: test_mx_util test_mx_log.o: $(mx_log.h) +test_mx_log.o: CFLAGS += -Wno-format-zero-length clean: CLEAN += test_mx_log.o test_mx_log: mx_log.o diff --git a/mx_log.h b/mx_log.h index 8b17631f..096f5652 100644 --- a/mx_log.h +++ b/mx_log.h @@ -53,7 +53,7 @@ int mx_log_level_get(void); int mx_log_level_mxlog_to_syslog(int level); int mx_log_level_syslog_to_mxlog(int level); -int mx_log_do(int level, char *file, unsigned long line, const char *func, const char *fmt, ...); +int mx_log_do(int level, char *file, unsigned long line, const char *func, const char *fmt, ...) __attribute__ ((format(printf, 5, 6)));; int mx_log_printf(const char *fmt, ...); int mx_log_finish(void); diff --git a/mx_mysql.c b/mx_mysql.c index 7cebcf98..e151bfbb 100644 --- a/mx_mysql.c +++ b/mx_mysql.c @@ -715,12 +715,12 @@ void _mx_mysql_bind_dump_index(struct mx_mysql_bind *b, unsigned int index) { mx_debug_value("%d", index); mx_debug_value("%d", b->bind[index].buffer_type); - mx_debug_value("%d", b->bind[index].buffer_length); + mx_debug_value("%lu", b->bind[index].buffer_length); mx_debug_value("%p", b->bind[index].buffer); if (b->bind[index].buffer_type == MYSQL_TYPE_STRING) - mx_debug_value("%s", b->bind[index].buffer); + mx_debug_value("%s", (char *)b->bind[index].buffer); mx_debug_value("%d", b->bind[index].is_unsigned); - mx_debug_value("%d", *b->bind[index].length); + mx_debug_value("%lu", *b->bind[index].length); mx_debug_value("%d", *b->bind[index].is_null); mx_debug_value("%d", *b->bind[index].error); mx_debug_value("0x%x", b->data[index].flags); @@ -738,7 +738,7 @@ void _mx_mysql_bind_dump(struct mx_mysql_bind *b) } mx_debug_value("%d", b->type); - mx_debug_value("%d", b->count); + mx_debug_value("%lu", b->count); for (i=0; i < b->count; i++) { _mx_mysql_bind_dump_index(b, i); @@ -845,7 +845,7 @@ int mx_mysql_option_set_default_file(struct mx_mysql *mysql, char *fname) if (fname && (*fname == '/') && (euidaccess(fname, R_OK) != 0)) { mx_log_warning("MySQL ignoring defaults file: euidaccess(\"%s\", R_OK) failed: %m", fname); - mx_log_warning("MySQL falling back to mysql default config search path.", fname); + mx_log_warning("MySQL falling back to mysql default config search path."); return -errno; } diff --git a/mxqadmin.c b/mxqadmin.c index 55d64bca..b216aa59 100644 --- a/mxqadmin.c +++ b/mxqadmin.c @@ -163,7 +163,7 @@ int _close_group_for_user(struct mx_mysql *mysql, uint64_t group_id, uint64_t us res = update_group_flags_closed(mysql, group_id, user_uid); if (res == 0) { - mx_log_warning("no group with group_id=%lu found for user with uid=%d", + mx_log_warning("no group with group_id=%lu found for user with uid=%lu", group_id, user_uid); return -(errno=ENOENT); } @@ -186,7 +186,7 @@ int _reopen_group_for_user(struct mx_mysql *mysql, uint64_t group_id, uint64_t u res = update_group_flags_reopen(mysql, group_id, user_uid); if (res == 0) { - mx_log_warning("no group with group_id=%lu found for user with uid=%d", + mx_log_warning("no group with group_id=%lu found for user with uid=%lu", group_id, user_uid); return -(errno=ENOENT); } @@ -315,7 +315,7 @@ int main(int argc, char *argv[]) passwd = getpwuid(arg_uid); if (!passwd) { if (errno) - mx_log_err("Can't load user '%s': %m"); + mx_log_err("Can't load user with uid '%lu': %m", arg_uid); else mx_log_err("Invalid argument for --user '%s': User not found.", optctl.optarg); exit(EX_USAGE); diff --git a/mxqd.c b/mxqd.c index 373b4810..77d6f429 100644 --- a/mxqd.c +++ b/mxqd.c @@ -1408,7 +1408,7 @@ void server_dump(struct mxq_server *server) for (glist = ulist->groups; glist; glist = glist->next) { group = &glist->group; - mx_log_info(" group=%s(%d):%lu %s jobs_max=%lu slots_per_job=%d jobs_in_q=%lu", + mx_log_info(" group=%s(%d):%lu %s jobs_max=%lu slots_per_job=%lu jobs_in_q=%lu", group->user_name, group->user_uid, group->group_id, @@ -1635,7 +1635,7 @@ int killall_over_memory(struct mxq_server *server) pinfo = mx_proc_tree_proc_info(ptree, job->host_pid); if (!pinfo) { - mx_log_warning("killall_over_memory(): Can't find process with pid %llu in process tree", + mx_log_warning("killall_over_memory(): Can't find process with pid %u in process tree", job->host_pid); continue; } @@ -1648,7 +1648,7 @@ int killall_over_memory(struct mxq_server *server) if (jlist->max_sumrss/1024 <= group->job_memory) continue; - mx_log_info("killall_over_memory(): used(%lluMiB) > requested(%lluMiB): Sending signal=%d to job=%s(%d):%lu:%lu pgrp=%d", + mx_log_info("killall_over_memory(): used(%lluMiB) > requested(%luMiB): Sending signal=%d to job=%s(%d):%lu:%lu pgrp=%d", jlist->max_sumrss/1024, group->job_memory, signal, @@ -1787,7 +1787,7 @@ static char *fspool_get_filename (struct mxq_server *server,long unsigned int jo return fspool_filename; } -static int fspool_process_file(struct mxq_server *server,char *filename,int job_id) { +static int fspool_process_file(struct mxq_server *server,char *filename, uint64_t job_id) { FILE *in; int res; @@ -1836,7 +1836,7 @@ static int fspool_process_file(struct mxq_server *server,char *filename,int job_ return -errno; } - mx_log_info("job finished (via fspool) : job %d pid %d status %d",job_id,pid,status); + mx_log_info("job finished (via fspool) : job %lu pid %d status %d", job_id, pid, status); jlist = server_remove_job_list_by_pid(server, pid); if (!jlist) { @@ -1846,7 +1846,7 @@ static int fspool_process_file(struct mxq_server *server,char *filename,int job_ job = &jlist->job; if (job->job_id != job_id) { - mx_log_warning("fspool_process_file: %s: job_id(pid)[%ld] != job_id(filename)[%ld]", + mx_log_warning("fspool_process_file: %s: job_id(pid)[%lu] != job_id(filename)[%lu]", filename, job->job_id, job_id); @@ -1969,7 +1969,7 @@ static int lost_scan_one(struct mxq_server *server) return -errno; if (!fspool_file_exists(server, job->job_id)) { - mx_log_warning("pid %u: process is gone. cancel job %d", + mx_log_warning("pid %u: process is gone. cancel job %lu", jlist->job.host_pid, jlist->job.job_id); server_remove_job_list_by_pid(server, job->host_pid); diff --git a/mxqdump.c b/mxqdump.c index 8b0b9665..2d6ed40f 100644 --- a/mxqdump.c +++ b/mxqdump.c @@ -388,7 +388,7 @@ static int dump_jobs(struct mx_mysql *mysql, uint64_t group_id, uint64_t job_sta grp_cnt = mxq_load_running_groups(mysql, &groups); } - mx_debug_value("%lu", grp_cnt); + mx_debug_value("%d", grp_cnt); for (g=0; g < grp_cnt; g++) { grp = &groups[g]; @@ -398,7 +398,7 @@ static int dump_jobs(struct mx_mysql *mysql, uint64_t group_id, uint64_t job_sta else job_cnt = mxq_load_jobs_in_group(mysql, &jobs, grp); - mx_debug_value("%lu", job_cnt); + mx_debug_value("%d", job_cnt); for (j=0; j < job_cnt; j++) { job = &jobs[j]; @@ -783,10 +783,10 @@ int main(int argc, char *argv[]) mx_log_notice("No group found with group_id=%lu.", arg_group_id); } else { if (UINT64_HASVALUE(arg_uid) && !arg_all && !(arg_uid == ruid && !arg_running)) { - mx_log_debug("DO: print running groups for user with uid=%d", arg_uid); + mx_log_debug("DO: print running groups for user with uid=%lu", arg_uid); cnt = dump_groups(mysql, MXQ_JOB_STATUS_RUNNING, arg_uid); if (!cnt) - mx_log_notice("No running groups found for user with uid=%d", arg_uid); + mx_log_notice("No running groups found for user with uid=%lu", arg_uid); } else if (arg_uid == UINT64_ALL && arg_all) { mx_log_debug("DO: print all groups"); cnt = dump_groups(mysql, UINT64_ALL, UINT64_ALL); @@ -796,7 +796,7 @@ int main(int argc, char *argv[]) mx_log_debug("DO: print all groups for user with uid=%lu", arg_uid); cnt = dump_groups(mysql, UINT64_ALL, arg_uid); if (!cnt) - mx_log_notice("No groups found for user with uid=%d.", arg_uid); + mx_log_notice("No groups found for user with uid=%lu.", arg_uid); } else { if (arg_uid == UINT64_ALL) { mx_log_debug("DO: print all running groups"); diff --git a/mxqkill.c b/mxqkill.c index 8cb319fb..7b0d25e4 100644 --- a/mxqkill.c +++ b/mxqkill.c @@ -332,7 +332,7 @@ int main(int argc, char *argv[]) passwd = getpwuid(arg_uid); if (!passwd) { if (errno) - mx_log_err("Can't load user '%s': %m"); + mx_log_err("Can't load user with uid '%lu': %m", arg_uid); else mx_log_err("Invalid argument for --user '%s': User not found.", optctl.optarg); exit(EX_USAGE); diff --git a/mxqsub.c b/mxqsub.c index 1559864b..81d7627b 100644 --- a/mxqsub.c +++ b/mxqsub.c @@ -909,7 +909,7 @@ int main(int argc, char *argv[]) if (!arg_program_name) { p = strchr(argv[0], ' '); if (p) { - mx_log_crit(" contains whitespace characters. Please set --command-alias if this is intended.", optctl.optarg); + mx_log_crit(" contains whitespace characters. Please set --command-alias if this is intended."); exit(EX_CONFIG); } arg_program_name = argv[0];