[Cvs-cvs] ccvs/src ChangeLog hash.c recurse.c server.h tag.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     07/10/28 17:44:17

Modified files:
        src            : ChangeLog hash.c recurse.c server.h tag.c 

Log message:
        * server.h (TRACE_PTR): Abstract cross-platform printing of pointers.
        * hash.c, recurse.c, tag.c: Use new macro.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3544&r2=1.3545
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/hash.c?cvsroot=cvs&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&r1=1.124&r2=1.125
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/server.h?cvsroot=cvs&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/tag.c?cvsroot=cvs&r1=1.152&r2=1.153

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3544
retrieving revision 1.3545
diff -u -b -r1.3544 -r1.3545
--- ChangeLog   12 Sep 2007 19:38:04 -0000      1.3544
+++ ChangeLog   28 Oct 2007 17:44:16 -0000      1.3545
@@ -1,3 +1,8 @@
+2007-10-28  Derek Price  <address@hidden>
+
+       * server.h (TRACE_PTR): Abstract cross-platform printing of pointers.
+       * hash.c, recurse.c, tag.c: Use new macro.
+
 2007-09-12  Derek Price  <address@hidden>
 
        * server.h (TRACE_MINUTIA): Add new trace level.

Index: hash.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/hash.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- hash.c      12 Sep 2007 17:27:22 -0000      1.51
+++ hash.c      28 Oct 2007 17:44:17 -0000      1.52
@@ -414,14 +414,8 @@
     Node *head, *p;
     int err = 0;
 
-#ifdef HAVE_PRINTF_PTR
-    TRACE (TRACE_FLOW, "walklist ( list=%p, proc=%p, closure=%p )",
-          (void *)list, (void *)proc, (void *)closure);
-#else
-    TRACE (TRACE_FLOW, "walklist ( list=%lx, proc=%lx, closure=%lx )",
-          (unsigned long)list,(unsigned long) proc,
-          (unsigned long)closure);
-#endif
+    TRACE (TRACE_FLOW, "walklist (list=%s, proc=%s, closure=%s)",
+          TRACE_PTR (list, 0), TRACE_PTR (proc, 1), TRACE_PTR (closure, 2));
 
     if (list == NULL)
        return 0;
@@ -552,17 +546,10 @@
        return 0;
     }
 
-#ifdef HAVE_PRINTF_PTR
-    (void) printf("Node at %p: type = %s, key = %p = \"%s\", data = %p, next = 
%p, prev = %p\n",
-          (void *) node, nodetypestring(node->type),
-          (void *) node->key, node->key, node->data,
-          (void *) node->next, (void *) node->prev);
-#else
-    (void) printf("Node at 0x%lx: type = %s, key = 0x%lx = \"%s\", data = 
0x%lx, next = 0x%lx, prev = 0x%lx\n",
-          (unsigned long) node, nodetypestring(node->type),
-          (unsigned long) node->key, node->key, (unsigned long) node->data,
-          (unsigned long) node->next, (unsigned long) node->prev);
-#endif
+    printf("Node at %s: type=%s, key=%s = \"%s\", data=%s, next=%s, prev=%s\n",
+          TRACE_PTR (node, 0), nodetypestring(node->type),
+          TRACE_PTR (node->key, 1), node->key, TRACE_PTR (node->data, 2),
+          TRACE_PTR (node->next, 3), TRACE_PTR (node->prev, 4));
 
     return 0;
 }
@@ -582,14 +569,9 @@
        return;
     }
 
-#ifdef HAVE_PRINTF_PTR
-    (void) printf("List at %p: list = %p, HASHSIZE = %d, next = %p\n",
-          (void *) list, (void *) list->list, HASHSIZE, (void *) list->next);
-#else
-    (void) printf("List at 0x%lx: list = 0x%lx, HASHSIZE = %d, next = 0x%lx\n",
-          (unsigned long) list, (unsigned long) list->list, HASHSIZE,
-          (unsigned long) list->next);
-#endif
+    printf ("List at %s: list=%s, HASHSIZE=%d, next=%s\n",
+           TRACE_PTR (list, 0), TRACE_PTR (list->list, 1), HASHSIZE,
+           TRACE_PTR (list->next, 2));
 
     (void) walklist(list, printnode, NULL);
 

Index: recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- recurse.c   12 Sep 2007 19:14:27 -0000      1.124
+++ recurse.c   28 Oct 2007 17:44:17 -0000      1.125
@@ -201,35 +201,19 @@
     List *files_by_dir = NULL;
     struct recursion_frame frame;
 
-#ifdef HAVE_PRINTF_PTR
     TRACE (TRACE_FLOW,
-          "start_recursion (fileproc=%p, filesdoneproc=%p,\n"
-      "                      direntproc=%p, dirleavproc=%p,\n"
-      "                      callerdat=%p, argc=%d, argv=%p,\n"
+          "start_recursion (fileproc=%s, filesdoneproc=%s,\n"
+      "                      direntproc=%s, dirleavproc=%s,\n"
+      "                      callerdat=%s, argc=%d, argv=%s,\n"
       "                      local=%d, which=%d, aflag=%d,\n"
       "                      locktype=%d, update_preload=%s\n"
       "                      dosrcs=%d, repository_in=%s )",
-          (void *) fileproc, (void *) filesdoneproc,
-          (void *) direntproc, (void *) dirleaveproc,
-          (void *) callerdat, argc, (void *) argv,
+          TRACE_PTR (fileproc, 0), TRACE_PTR (filesdoneproc, 1),
+          TRACE_PTR (direntproc, 2), TRACE_PTR (dirleaveproc, 3),
+          TRACE_PTR (callerdat, 4), argc, TRACE_PTR (argv, 5),
           local, which, aflag, locktype,
           TRACE_NULL (update_preload), dosrcs,
           TRACE_NULL (repository_in));
-#else
-    TRACE (TRACE_FLOW,
-          "start_recursion (fileproc=%lx, filesdoneproc=%lx,\n"
-      "                      direntproc=%lx, dirleavproc=%lx,\n"
-      "                      callerdat=%lx, argc=%d, argv=%lx,\n"
-      "                      local=%d, which=%d, aflag=%d,\n"
-      "                      locktype=%d, update_preload=%s\n"
-      "                      dosrcs=%d, repository_in=%s )",
-          (unsigned long) fileproc, (unsigned long) filesdoneproc,
-          (unsigned long) direntproc, (unsigned long) dirleaveproc,
-          (unsigned long) callerdat, argc, (unsigned long) argv,
-          local, which, aflag, locktype,
-          TRACE_NULL (update_preload), dosrcs,
-          TRACE_NULL (repository_in));
-#endif
 
     frame.fileproc = fileproc;
     frame.filesdoneproc = filesdoneproc;

Index: server.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/server.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server.h    12 Sep 2007 19:38:04 -0000      1.49
+++ server.h    28 Oct 2007 17:44:17 -0000      1.50
@@ -244,6 +244,21 @@
   __attribute__ ((__format__ (__printf__, 2, 3)));
 #define TRACE cvs_trace
 
+static inline const char *
+cvs_trace_ptr (void *ptr_in, unsigned short int index)
+{
+    /* # bytes * 2 chars/byte + '0x\0'.  */
+#ifdef HAVE_PRINTF_PTR
+    static char buf[10][sizeof (void *) * 2 + 3];
+    sprintf (buf[index], "%p", ptr_in);
+#else
+    static char buf[10][sizeof (unsigned long) * 2 + 3];
+    sprintf (buf[index], "%lx", (unsigned long) ptr_in);
+#endif
+    return buf[index];
+}
+#define TRACE_PTR cvs_trace_ptr
+
 
 
 extern cvsroot_t *referrer;

Index: tag.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/tag.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- tag.c       12 Sep 2007 17:27:24 -0000      1.152
+++ tag.c       28 Oct 2007 17:44:17 -0000      1.153
@@ -438,25 +438,14 @@
     char *repository;
     char *where;
 
-#ifdef HAVE_PRINTF_PTR
     TRACE (TRACE_FUNCTION,
-          "rtag_proc (argc=%d, argv=%p, xwhere=%s,\n"
+          "rtag_proc (argc=%d, argv=%s, xwhere=%s,\n"
       "                mwhere=%s, mfile=%s, shorten=%d,\n"
       "                local_specified=%d, mname=%s, msg=%s)",
-           argc, (void *)argv, xwhere ? xwhere : "(null)",
+           argc, TRACE_PTR (argv, 0), xwhere ? xwhere : "(null)",
            mwhere ? mwhere : "(null)", mfile ? mfile : "(null)",
            shorten, local_specified,
            mname ? mname : "(null)", msg ? msg : "(null)" );
-#else
-    TRACE (TRACE_FUNCTION,
-          "rtag_proc (argc=%d, argv=%lx, xwhere=%s,\n"
-      "                mwhere=%s, mfile=%s, shorten=%d,\n"
-      "                local_specified=%d, mname=%s, msg=%s )",
-           argc, (unsigned long)argv, xwhere ? xwhere : "(null)",
-           mwhere ? mwhere : "(null)", mfile ? mfile : "(null)",
-           shorten, local_specified,
-           mname ? mname : "(null)", msg ? msg : "(null)" );
-#endif
 
     if (is_rtag)
     {
@@ -1641,21 +1630,12 @@
     struct saved_cwd cwd;
     int which;
 
-#ifdef HAVE_PRINTF_PTR
-    TRACE (TRACE_FUNCTION,
-          "tag_check_valid (name=%s, argc=%d, argv=%p, local=%d,\n"
-      "                      aflag=%d, repository=%s, valid=%s)",
-          name ? name : "(name)", argc, (void *)argv, local, aflag,
-          repository ? repository : "(null)",
-          valid ? "true" : "false");
-#else
     TRACE (TRACE_FUNCTION,
-          "tag_check_valid (name=%s, argc=%d, argv=%lx, local=%d,\n"
+          "tag_check_valid (name=%s, argc=%d, argv=%s, local=%d,\n"
       "                      aflag=%d, repository=%s, valid=%s)",
-          name ? name : "(name)", argc, (unsigned long)argv, local, aflag,
+          name ? name : "(name)", argc, TRACE_PTR (argv, 0), local, aflag,
           repository ? repository : "(null)",
           valid ? "true" : "false");
-#endif
 
     /* Numeric tags require only a syntactic check.  */
     if (isdigit ((unsigned char) name[0]))