]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
certtool: in 32-bit systems use PRIu64 to print 64-bit values
authorNikos Mavrogiannopoulos <nmav@gnutls.org>
Thu, 5 Mar 2015 17:59:25 +0000 (18:59 +0100)
committerNikos Mavrogiannopoulos <nmav@gnutls.org>
Thu, 5 Mar 2015 18:00:41 +0000 (19:00 +0100)
src/certtool-cfg.c

index 332b8b2e967ee716e2d3ae3a6e24173ab6be8121..57ca2cc7662ac00697bf8648c653535a8519171b 100644 (file)
 #include <getpass.h>
 #include "certtool-common.h"
 
+/* to print uint64_t */
+#if SIZEOF_LONG < 8
+# define __STDC_FORMAT_MACROS
+# include <inttypes.h>
+#endif
+
 extern int batch;
 extern int ask_pass;
 
@@ -1137,10 +1143,11 @@ void get_rand_int_value(unsigned char* serial, size_t * size, int64_t cfg_val, c
 
 #if SIZEOF_LONG < 8
                default_serial_int = ts.tv_sec;
+               snprintf(tmsg, sizeof(tmsg), "%s (default: %" PRIu64"): ", msg, default_serial_int);
 #else
                default_serial_int = (ts.tv_sec << 32) | ts.tv_nsec;
-#endif
                snprintf(tmsg, sizeof(tmsg), "%s (default: %lu): ", msg, default_serial_int);
+#endif
                default_serial_int = read_int_with_default(tmsg, (long)default_serial_int);
 
                default_serial[0] = default_serial_int >> 32;