From 74d9a93067733e61d27038b905bf0f8325a102b5 Mon Sep 17 00:00:00 2001
From: Marek Michalkiewicz <marekm@amelek.gda.pl>
Date: Sat, 28 May 2016 23:23:16 +0200
Subject: accel-ppp Debian x32 fix minor -Wformat warnings
Hello,
small patch to avoid gcc -Wformat warnings on Debian x32 where time_t
is "long long" (64-bit signed, to be 2038 safe), not "unsigned long"
(32-bit unsigned) corresponding to "%lu" format strings.
Regards,
Marek
---
accel-pppd/cli/std_cmd.c | 2 +-
accel-pppd/extra/pppd_compat.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/accel-pppd/cli/std_cmd.c b/accel-pppd/cli/std_cmd.c
index 62327f9..500102b 100644
--- a/accel-pppd/cli/std_cmd.c
+++ b/accel-pppd/cli/std_cmd.c
@@ -20,7 +20,7 @@ void core_restart(int);
static int show_stat_exec(const char *cmd, char * const *fields, int fields_cnt, void *client)
{
struct timespec ts;
- time_t dt;
+ unsigned long dt;
int day,hour;
char statm_fname[128];
FILE *f;
diff --git a/accel-pppd/extra/pppd_compat.c b/accel-pppd/extra/pppd_compat.c
index 2956624..2c8460f 100644
--- a/accel-pppd/extra/pppd_compat.c
+++ b/accel-pppd/extra/pppd_compat.c
@@ -468,7 +468,7 @@ static void write_radattr(struct pppd_compat_pd *pd, struct rad_packet_t *pack)
fprintf(f, "%i.%i.%i.%i\n", (addr >> 24) & 0xff, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
break;
case ATTR_TYPE_DATE:
- fprintf(f, "%lu\n", attr->val.date);
+ fprintf(f, "%lu\n", (unsigned long) attr->val.date);
break;
}
}
@@ -560,7 +560,7 @@ static void fill_env(char **env, char *mem, struct pppd_compat_pd *pd)
if (pd->ses->stop_time) {
env[n++] = mem;
- mem += sprintf(mem, "CONNECT_TIME=%lu", pd->ses->stop_time - pd->ses->start_time) + 1;
+ mem += sprintf(mem, "CONNECT_TIME=%lu", (unsigned long)(pd->ses->stop_time - pd->ses->start_time)) + 1;
env[n++] = mem;
mem += sprintf(mem, "BYTES_SENT=%" PRIu64, tx_bytes) + 1;
env[n++] = mem;
--
cgit v1.2.3