Changeset f922d1d in rtems

Timestamp:

10/02/11 10:37:28 (12 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.11, 5, master

Children:

f2f1d342

Parents:

ff09991

Message:

2011-10-02 Ralf Corsépius <ralf.corsepius@…>

• libmisc/uuid/gen_uuid.c: Introduce PRIutime_t, SCNutime_t and "utime_t" for 64bit-time_t support.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• libmisc/uuid/gen_uuid.c (modified) (3 diffs)

cpukit/ChangeLog

@@ -1 +1 @@
 2011-10-02      Ralf Corsépius <ralf.corsepius@rtems.org>
 
-        * libmisc/shell/main_time.c: Introduce PRIutime_t, SCNutime_t and
+        * libmisc/uuid/gen_uuid.c: Introduce PRIutime_t, SCNutime_t and
         "utime_t" for 64bit-time_t support.
 

cpukit/libmisc/uuid/gen_uuid.c

@@ -96 +96 @@
 #endif
 
+#if SIZEOF_TIME_T == 8
+#define PRIutime_t      PRIu64
+#define SCNutime_t      SCNu64
+#define utime_t         uint64_t
+#elif SIZEOF_TIME_T == 4
+#define PRIutime_t      PRIu32
+#define SCNutime_t      SCNu32
+#define utime_t         uint32_t
+#else
+#error "unsupport size of time_t"
+#endif
+
 #include "uuidP.h"
 #include "uuidd.h"
@@ -353 +365 @@
         if (state_fd >= 0) {
                 unsigned int cl;
-                unsigned long tv1, tv2;
+                utime_t tv1;
+                unsigned long tv2;
                 int a;
 
-                if (fscanf(state_f, "clock: %04x tv: %lu %lu adj: %d\n",
+                if (fscanf(state_f, "clock: %04x tv: %" SCNutime_t " %lu adj: %d\n",
                            &cl, &tv1, &tv2, &a) == 4) {
                         clock_seq = cl & 0x3FFF;
@@ -405 +418 @@
                 rewind(state_f);
                 len = fprintf(state_f,
-                              "clock: %04x tv: %016lu %08lu adj: %08d\n",
+                              "clock: %04x tv: %016" PRIutime_t " %08lu adj: %08d\n",
                               clock_seq, last.tv_sec, last.tv_usec, adjustment);
                 fflush(state_f);