From 8311a3ebf2477adc75ae010cde73ab03f9b9bc74 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 7 Dec 2008 18:59:23 -0600 Subject: [PATCH] Cleanup: fix various int/long format string errors. Various format strings used int values with long format specifiers. Fix the format specifiers to be consistent with the values supplied. --- apps/irssi/src/silc/core/client_ops.c | 2 +- apps/silcd/serverconfig.c | 2 +- lib/silcske/silcske.c | 2 +- lib/silcutil/silcschedule.c | 2 +- lib/silcutil/unix/silcunixschedule.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/irssi/src/silc/core/client_ops.c b/apps/irssi/src/silc/core/client_ops.c index 16feddc7..cfefe327 100644 --- a/apps/irssi/src/silc/core/client_ops.c +++ b/apps/irssi/src/silc/core/client_ops.c @@ -1677,7 +1677,7 @@ void silc_command_reply(SilcClient client, SilcClientConnection conn, if (idle && nickname) { memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf) - 1, "%lu %s", + snprintf(buf, sizeof(buf) - 1, "%u %s", idle > 60 ? (idle / 60) : idle, idle > 60 ? "minutes" : "seconds"); diff --git a/apps/silcd/serverconfig.c b/apps/silcd/serverconfig.c index 30d76af3..a2c58923 100644 --- a/apps/silcd/serverconfig.c +++ b/apps/silcd/serverconfig.c @@ -1542,7 +1542,7 @@ SilcServerConfig silc_server_config_alloc(const char *filename, silc_config_strerror(ret))); linebuf = silc_config_read_line(file, line); if (linebuf) { - SILC_SERVER_LOG_ERROR((" file %s line %lu: %s\n", filename, + SILC_SERVER_LOG_ERROR((" file %s line %u: %s\n", filename, line, linebuf)); silc_free(linebuf); } diff --git a/lib/silcske/silcske.c b/lib/silcske/silcske.c index a4822e95..5cb7c91d 100644 --- a/lib/silcske/silcske.c +++ b/lib/silcske/silcske.c @@ -80,7 +80,7 @@ static SilcBool silc_ske_packet_send(SilcSKE ske, */ static void silc_ske_notify_failure(SilcSKE ske) { - SILC_LOG_DEBUG(("Notifying SKE %p owner of failure (failure_notified = %lu)", + SILC_LOG_DEBUG(("Notifying SKE %p owner of failure (failure_notified = %d)", ske, ske->failure_notified)); /* diff --git a/lib/silcutil/silcschedule.c b/lib/silcutil/silcschedule.c index 6c2f78ca..31168d30 100644 --- a/lib/silcutil/silcschedule.c +++ b/lib/silcutil/silcschedule.c @@ -290,7 +290,7 @@ void silc_schedule_stats(SilcSchedule schedule) { SilcTaskFd ftask; fprintf(stdout, "Schedule %p statistics:\n\n", schedule); - fprintf(stdout, "Num FD tasks : %lu (%lu bytes allocated)\n", + fprintf(stdout, "Num FD tasks : %u (%u bytes allocated)\n", silc_hash_table_count(schedule->fd_queue), sizeof(*ftask) * silc_hash_table_count(schedule->fd_queue)); fprintf(stdout, "Num Timeout tasks : %d (%d bytes allocated)\n", diff --git a/lib/silcutil/unix/silcunixschedule.c b/lib/silcutil/unix/silcunixschedule.c index 80e8fbf2..bcbe1203 100644 --- a/lib/silcutil/unix/silcunixschedule.c +++ b/lib/silcutil/unix/silcunixschedule.c @@ -274,7 +274,7 @@ SilcBool silc_schedule_internal_schedule_fd(SilcSchedule schedule, if (!internal) return TRUE; - SILC_LOG_DEBUG(("Scheduling fd %lu, mask %x", task->fd, event_mask)); + SILC_LOG_DEBUG(("Scheduling fd %u, mask %x", task->fd, event_mask)); memset(&event, 0, sizeof(event)); if (event_mask & SILC_TASK_READ) -- 2.24.0