Changeset 358cba0 for src/libcfa/time.c

Timestamp:

May 15, 2018, 4:17:15 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

2e5fa345

Parents:

7d0a3ba (diff), a61fa0bb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/libcfa/time.c (modified) (5 diffs)

src/libcfa/time.c

@@ -10 +10 @@
 // Created On       : Tue Mar 27 13:33:14 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr 12 14:41:00 2018
-// Update Count     : 22
+// Last Modified On : Sun May  6 22:26:00 2018
+// Update Count     : 37
 // 
 
@@ -17 +17 @@
 #include "iostream"
 #include <stdio.h>                                                                              // snprintf
+#include <assert.h>
 
 static char * nanomsd( long int ns, char * buf ) {              // most significant digits
@@ -87 +88 @@
         time_t s = tv / TIMEGRAN;
         tm tm;
-        gmtime_r( &s, &tm );
+        gmtime_r( &s, &tm );                                                            // tm_mon <= 11, tm_mday <= 31
+#if defined(__GNUC__) && __GNUC__ >= 7
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
         snprintf( buf, 9, "%02d/%02d/%02d", tm.tm_year % 99, tm.tm_mon + 1, tm.tm_mday );
+#if defined(__GNUC__) && __GNUC__ >= 7
+#pragma GCC diagnostic pop
+#endif
         return buf;
 } // yy_mm_dd
@@ -95 +103 @@
         time_t s = tv / TIMEGRAN;
         tm tm;
-        gmtime_r( &s, &tm );
+        gmtime_r( &s, &tm );                                                            // tm_mon <= 11, tm_mday <= 31
+#if defined(__GNUC__) && __GNUC__ >= 7
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
         snprintf( buf, 9, "%02d/%02d/%02d", tm.tm_mon + 1, tm.tm_mday, tm.tm_year % 99 );
+#if defined(__GNUC__) && __GNUC__ >= 7
+#pragma GCC diagnostic pop
+#endif
         return buf;
 } // mm_dd_yy
@@ -103 +118 @@
         time_t s = tv / TIMEGRAN;
         tm tm;
-        gmtime_r( &s, &tm );
+        gmtime_r( &s, &tm );                                                            // tm_mon <= 11, tm_mday <= 31
+#if defined(__GNUC__) && __GNUC__ >= 7
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
         snprintf( buf, 9, "%02d/%02d/%02d", tm.tm_mday, tm.tm_mon + 1, tm.tm_year % 99 );
+#if defined(__GNUC__) && __GNUC__ >= 7
+#pragma GCC diagnostic pop
+#endif
         return buf;
 } // dd_mm_yy