From 77910830e39250078ffcd590969a8c9fb043db06 Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Sun, 23 Feb 2014 22:46:06 +0100 Subject: [PATCH] Fix various printf arg types. --- include/messages.h | 4 ++-- modules/m_stats.c | 4 ++-- modules/m_trace.c | 2 +- modules/m_whois.c | 4 ++-- src/parse.c | 2 +- src/s_user.c | 3 ++- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/messages.h b/include/messages.h index 207b12c4..6e06e435 100644 --- a/include/messages.h +++ b/include/messages.h @@ -43,7 +43,7 @@ #define NUMERIC_STR_200 "Link %s %s %s" #define NUMERIC_STR_201 "Try. %s %s" #define NUMERIC_STR_202 "H.S. %s %s" -#define NUMERIC_STR_203 "???? %s %s (%s) %d" +#define NUMERIC_STR_203 "???? %s %s (%s) %lu" #define NUMERIC_STR_204 "Oper %s %s (%s) %lu %lu" #define NUMERIC_STR_205 "User %s %s (%s) %lu %lu" #define NUMERIC_STR_206 "Serv %s %dS %dC %s %s!%s@%s %lu" @@ -94,7 +94,7 @@ #define NUMERIC_STR_313 "%s :%s" #define NUMERIC_STR_314 ":%s 314 %s %s %s %s * :%s" #define NUMERIC_STR_315 ":%s 315 %s %s :End of /WHO list." -#define NUMERIC_STR_317 "%s %d %d :seconds idle, signon time" +#define NUMERIC_STR_317 "%s %ld %lu :seconds idle, signon time" #define NUMERIC_STR_318 "%s :End of /WHOIS list." #define NUMERIC_STR_319 ":%s 319 %s %s :" #define NUMERIC_STR_321 ":%s 321 %s Channel :Users Name" diff --git a/modules/m_stats.c b/modules/m_stats.c index 667b8fbc..895ebf46 100644 --- a/modules/m_stats.c +++ b/modules/m_stats.c @@ -977,8 +977,8 @@ stats_uptime (struct Client *source_p) now = rb_current_time() - startup_time; sendto_one_numeric(source_p, RPL_STATSUPTIME, form_str (RPL_STATSUPTIME), - now / 86400, (now / 3600) % 24, - (now / 60) % 60, now % 60); + (int)(now / 86400), (int)((now / 3600) % 24), + (int)((now / 60) % 60), (int)(now % 60)); sendto_one_numeric(source_p, RPL_STATSCONN, form_str (RPL_STATSCONN), MaxConnectionCount, MaxClientCount, diff --git a/modules/m_trace.c b/modules/m_trace.c index c3a3891c..f8f6621c 100644 --- a/modules/m_trace.c +++ b/modules/m_trace.c @@ -374,7 +374,7 @@ report_this_status(struct Client *source_p, struct Client *target_p) sendto_one_numeric(source_p, RPL_TRACEUNKNOWN, form_str(RPL_TRACEUNKNOWN), class_name, name, ip, - rb_current_time() - target_p->localClient->firsttime); + (unsigned long)(rb_current_time() - target_p->localClient->firsttime)); cnt++; break; diff --git a/modules/m_whois.c b/modules/m_whois.c index b02aa1d5..ee0de946 100644 --- a/modules/m_whois.c +++ b/modules/m_whois.c @@ -363,8 +363,8 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) sendto_one_numeric(source_p, RPL_WHOISIDLE, form_str(RPL_WHOISIDLE), target_p->name, - rb_current_time() - target_p->localClient->last, - target_p->localClient->firsttime); + (long)(rb_current_time() - target_p->localClient->last), + (unsigned long)target_p->localClient->firsttime); } else { diff --git a/src/parse.c b/src/parse.c index 44dfd64e..e0d9fd1d 100644 --- a/src/parse.c +++ b/src/parse.c @@ -482,7 +482,7 @@ report_messages(struct Client *source_p) s_assert(amsg->name != NULL); sendto_one_numeric(source_p, RPL_STATSCOMMANDS, form_str(RPL_STATSCOMMANDS), - amsg->name, amsg->hits, 0, 0); + amsg->name, amsg->hits, 0L, 0); } } diff --git a/src/s_user.c b/src/s_user.c index 48b30d51..12008848 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -158,7 +158,8 @@ show_lusers(struct Client *source_p) if(rb_dlink_list_length(&oper_list) > 0) sendto_one_numeric(source_p, RPL_LUSEROP, - form_str(RPL_LUSEROP), rb_dlink_list_length(&oper_list)); + form_str(RPL_LUSEROP), + (int)rb_dlink_list_length(&oper_list)); if(rb_dlink_list_length(&unknown_list) > 0) sendto_one_numeric(source_p, RPL_LUSERUNKNOWN,