diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2007-01-20 15:13:05 +0000 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2007-01-20 15:13:05 +0000 |
| commit | 2f5914a343ec6b7f2543a22c0a64abd6ab97c5bb (patch) | |
| tree | 4d9dfc6dafbc529d13580401f5ddc8896d568e14 /src/libstrongswan/library.c | |
| parent | 4305c488ed5a2d61c04c37bf2619e40a4164a421 (diff) | |
| download | strongswan-2f5914a343ec6b7f2543a22c0a64abd6ab97c5bb.tar.bz2 strongswan-2f5914a343ec6b7f2543a22c0a64abd6ab97c5bb.tar.xz | |
fixed 64 bit issue with print time
Diffstat (limited to 'src/libstrongswan/library.c')
| -rw-r--r-- | src/libstrongswan/library.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/libstrongswan/library.c b/src/libstrongswan/library.c index cd40b6477..ce3f827fa 100644 --- a/src/libstrongswan/library.c +++ b/src/libstrongswan/library.c @@ -105,7 +105,7 @@ static int print_time(FILE *stream, const struct printf_info *info, "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - time_t time = *((time_t*)(args[0])); + time_t *time = *((time_t**)(args[0])); bool utc = TRUE; struct tm t; @@ -120,11 +120,11 @@ static int print_time(FILE *stream, const struct printf_info *info, } if (utc) { - gmtime_r(&time, &t); + gmtime_r(time, &t); } else { - localtime_r(&time, &t); + localtime_r(time, &t); } return fprintf(stream, "%s %02d %02d:%02d:%02d%s%04d", months[t.tm_mon], t.tm_mday, t.tm_hour, t.tm_min, @@ -137,11 +137,12 @@ static int print_time(FILE *stream, const struct printf_info *info, static int print_time_delta(FILE *stream, const struct printf_info *info, const void *const *args) { - time_t start = *((time_t*)(args[0])); - time_t end = *((time_t*)(args[1])); - u_int delta = abs(end - start); + time_t *start = *((time_t**)(args[0])); + time_t *end = *((time_t**)(args[1])); + u_int delta = abs(*end - *start); + char* unit = "second"; - + if (delta > 2 * 60 * 60 * 24) { delta /= 60 * 60 * 24; @@ -165,6 +166,6 @@ static int print_time_delta(FILE *stream, const struct printf_info *info, */ static void __attribute__ ((constructor))print_register() { - register_printf_function(PRINTF_TIME, print_time, arginfo_int_alt_int_int); - register_printf_function(PRINTF_TIME_DELTA, print_time_delta, arginfo_int_int); + register_printf_function(PRINTF_TIME, print_time, arginfo_ptr_alt_ptr_int); + register_printf_function(PRINTF_TIME_DELTA, print_time_delta, arginfo_ptr_ptr); } |