From c28eaf9bf8410cce3cc5e112b2067a1b60184ab5 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Sat, 9 Feb 2013 14:05:45 +0100 Subject: [PATCH] NWC: fix format string for loff_t which is longlog on 32 bit --- citadel/configure.ac | 1 + citadel/modules/networkclient/serv_networkclient.c | 4 ++-- citadel/sysdep_decls.h | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/citadel/configure.ac b/citadel/configure.ac index c140e7640..3a7997869 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -406,6 +406,7 @@ AC_CHECK_SIZEOF(short, 0) AC_CHECK_SIZEOF(int, 0) AC_CHECK_SIZEOF(long, 0) AC_CHECK_SIZEOF(size_t, 0) +AC_CHECK_SIZEOF(loff_t, 0) dnl AC_CHECK_SIZEOF(long long, 0) dnl Checks for libraries. diff --git a/citadel/modules/networkclient/serv_networkclient.c b/citadel/modules/networkclient/serv_networkclient.c index 4c1afa883..d92016620 100644 --- a/citadel/modules/networkclient/serv_networkclient.c +++ b/citadel/modules/networkclient/serv_networkclient.c @@ -378,7 +378,7 @@ eNextState NWC_SendREAD(AsyncNetworker *NW) SetNWCState(IO, eNWCVSFail); return eAbort; } - StrBufPrintf(NW->IO.SendBuf.Buf, "READ %ld|%ld\n", + StrBufPrintf(NW->IO.SendBuf.Buf, "READ "LOFF_T_FMT"|%ld\n", NW->IO.IOB.TotalSentAlready, NW->IO.IOB.TotalSendSize); /* @@ -561,7 +561,7 @@ eNextState NWC_ReadNUOPReply(AsyncNetworker *NW) eNextState NWC_SendWRIT(AsyncNetworker *NW) { AsyncIO *IO = &NW->IO; - StrBufPrintf(NW->IO.SendBuf.Buf, "WRIT %ld\n", + StrBufPrintf(NW->IO.SendBuf.Buf, "WRIT "LOFF_T_FMT"\n", NW->IO.IOB.TotalSendSize - NW->IO.IOB.TotalSentAlready); NWC_DBG_SEND(); return eSendReply; diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h index d301ffb14..23e8b2dd8 100644 --- a/citadel/sysdep_decls.h +++ b/citadel/sysdep_decls.h @@ -31,6 +31,12 @@ #define SIZE_T_FMT "%ld" #endif +#if SIZEOF_LOFF_T == SIZEOF_LONG +#define LOFF_T_FMT "%ld" +#else +#define LOFF_T_FMT "%lld" +#endif + void cputbuf(const StrBuf *Buf); #ifdef __GNUC__ -- 2.30.2