From 27005516a3d0181436e2cfbf7a8b1ac7388cd2e9 Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@pfeifer.com>
Date: Wed, 1 Oct 2003 03:32:16 +0000
Subject: [PATCH] Cast time_t to long for printing.

---
 server/registry.c   |  2 +-
 server/trace.c      | 18 +++++++++---------
 tools/make_requests |  3 +++
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/server/registry.c b/server/registry.c
index c090759e10e..5b2344d4c65 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -265,7 +265,7 @@ static void save_subkeys( const struct key *key, const struct key *base, FILE *f
     {
         fprintf( f, "\n[" );
         if (key != base) dump_path( key, base, f );
-        fprintf( f, "] %ld\n", key->modif );
+        fprintf( f, "] %ld\n", (long)key->modif );
         for (i = 0; i <= key->last_value; i++) dump_value( &key->values[i], f );
     }
     for (i = 0; i <= key->last_subkey; i++) save_subkeys( key->subkeys[i], base, f );
diff --git a/server/trace.c b/server/trace.c
index de05c24b431..dcfeb812610 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -542,8 +542,8 @@ static void dump_get_thread_info_reply( const struct get_thread_info_reply *req
     fprintf( stderr, " exit_code=%d,", req->exit_code );
     fprintf( stderr, " priority=%d,", req->priority );
     fprintf( stderr, " affinity=%d,", req->affinity );
-    fprintf( stderr, " creation_time=%ld,", req->creation_time );
-    fprintf( stderr, " exit_time=%ld", req->exit_time );
+    fprintf( stderr, " creation_time=%ld,", (long)req->creation_time );
+    fprintf( stderr, " exit_time=%ld", (long)req->exit_time );
 }
 
 static void dump_set_thread_info_request( const struct set_thread_info_request *req )
@@ -870,8 +870,8 @@ static void dump_truncate_file_request( const struct truncate_file_request *req
 static void dump_set_file_time_request( const struct set_file_time_request *req )
 {
     fprintf( stderr, " handle=%p,", req->handle );
-    fprintf( stderr, " access_time=%ld,", req->access_time );
-    fprintf( stderr, " write_time=%ld", req->write_time );
+    fprintf( stderr, " access_time=%ld,", (long)req->access_time );
+    fprintf( stderr, " write_time=%ld", (long)req->write_time );
 }
 
 static void dump_flush_file_request( const struct flush_file_request *req )
@@ -893,9 +893,9 @@ static void dump_get_file_info_reply( const struct get_file_info_reply *req )
 {
     fprintf( stderr, " type=%d,", req->type );
     fprintf( stderr, " attr=%d,", req->attr );
-    fprintf( stderr, " access_time=%ld,", req->access_time );
-    fprintf( stderr, " write_time=%ld,", req->write_time );
-    fprintf( stderr, " change_time=%ld,", req->change_time );
+    fprintf( stderr, " access_time=%ld,", (long)req->access_time );
+    fprintf( stderr, " write_time=%ld,", (long)req->write_time );
+    fprintf( stderr, " change_time=%ld,", (long)req->change_time );
     fprintf( stderr, " size_high=%d,", req->size_high );
     fprintf( stderr, " size_low=%d,", req->size_low );
     fprintf( stderr, " alloc_high=%d,", req->alloc_high );
@@ -1507,7 +1507,7 @@ static void dump_create_key_request( const struct create_key_request *req )
     fprintf( stderr, " parent=%p,", req->parent );
     fprintf( stderr, " access=%08x,", req->access );
     fprintf( stderr, " options=%08x,", req->options );
-    fprintf( stderr, " modif=%ld,", req->modif );
+    fprintf( stderr, " modif=%ld,", (long)req->modif );
     fprintf( stderr, " namelen=%d,", req->namelen );
     fprintf( stderr, " name=" );
     dump_varargs_unicode_str( min(cur_size,req->namelen) );
@@ -1555,7 +1555,7 @@ static void dump_enum_key_reply( const struct enum_key_reply *req )
     fprintf( stderr, " values=%d,", req->values );
     fprintf( stderr, " max_value=%d,", req->max_value );
     fprintf( stderr, " max_data=%d,", req->max_data );
-    fprintf( stderr, " modif=%ld,", req->modif );
+    fprintf( stderr, " modif=%ld,", (long)req->modif );
     fprintf( stderr, " total=%d,", req->total );
     fprintf( stderr, " namelen=%d,", req->namelen );
     fprintf( stderr, " name=" );
diff --git a/tools/make_requests b/tools/make_requests
index 1d7d7b63c04..6563e36b62d 100755
--- a/tools/make_requests
+++ b/tools/make_requests
@@ -269,6 +269,9 @@ sub DO_DUMP_FUNC
                 push @trace_lines, "    fprintf( stderr, \" $var=$formats{$type}";
                 push @trace_lines, "," if ($#_ > 0);
                 push @trace_lines, "\", ";
+                # In the case of time_t we need to cast the parameter to
+                # long to match the associated "%ld" printf modifier.
+                push @trace_lines, "(long)" if( $type eq "time_t" );
                 push @trace_lines, "req->$var );\n";
             }
 	}