typo fix

[packages/lxc.git] / x32.patch

diff --git a/x32.patch b/x32.patch
index 73de75f9cd91e17fe00cd025f27071e19a00015e..b3207a8b522c535ed49abed3eb6cdf9d8e132579 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,14 +1,15 @@
---- lxc-1.0.7/src/lxc/log.c.orig       2014-12-05 21:50:20.000000000 +0100
-+++ lxc-1.0.7/src/lxc/log.c    2015-03-13 21:30:29.354757660 +0100
-@@ -91,7 +91,11 @@
+diff -urN lxc-3.0.3.orig/src/lxc/log.c lxc-3.0.3/src/lxc/log.c
+--- lxc-3.0.3.orig/src/lxc/log.c       2018-11-23 00:08:27.000000000 +0100
++++ lxc-3.0.3/src/lxc/log.c    2019-01-28 19:52:33.204408097 +0100
+@@ -271,7 +271,11 @@
+       seconds = (time->tv_sec - d_in_s - h_in_s - (minutes * 60));
+ 
+       /* Make string from nanoseconds. */
++        #ifdef __ILP32__
++        ret = snprintf(nanosec, sizeof(nanosec), "%lld", (int64_t)time->tv_nsec);
++        #else
+       ret = snprintf(nanosec, sizeof(nanosec), "%"PRId64, (int64_t)time->tv_nsec);
++      #endif
+       if (ret < 0 || ret >= sizeof(nanosec))
+               return -1;
  
-       ms = event->timestamp.tv_usec / 1000;
-       n = snprintf(buffer, sizeof(buffer),
-+#ifdef __ILP32__
-+                   "%15s %10lld.%03d %-8s %s - %s:%s:%d - ",
-+#else
-                    "%15s %10ld.%03d %-8s %s - %s:%s:%d - ",
-+#endif
-                    log_prefix,
-                    event->timestamp.tv_sec,
-                    ms,