[Cvs-cvs] ccvs/src ChangeLog find_names.c hash.h ls.c rec...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/29 02:09:42

Modified files:
        src            : ChangeLog find_names.c hash.h ls.c recurse.c 

Log message:
        * find_names.c (Find_Directories): Output returned list in traces.
        * hash.h (printlist): Add prototype.
        * ls.c (ls_direntproc): Add function trace.
        * recurse.c (do_recursion): Condense traces.
        (do_file_proc, do_dir_proc): Add function traces.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3618&r2=1.3619
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/find_names.c?cvsroot=cvs&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/hash.h?cvsroot=cvs&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ls.c?cvsroot=cvs&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&r1=1.135&r2=1.136

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3618
retrieving revision 1.3619
diff -u -b -r1.3618 -r1.3619
--- ChangeLog   28 Sep 2008 04:39:48 -0000      1.3618
+++ ChangeLog   29 Sep 2008 02:09:41 -0000      1.3619
@@ -1,5 +1,11 @@
 2008-09-28  Derek R. Price  <address@hidden>
 
+       * find_names.c (Find_Directories): Output returned list in traces.
+       * hash.h (printlist): Add prototype.
+       * ls.c (ls_direntproc): Add function trace.
+       * recurse.c (do_recursion): Condense traces.
+       (do_file_proc, do_dir_proc): Add function traces.
+
        * recurse.c: Back out previous accidental, undocumented, and broken
        commit.
 

Index: find_names.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/find_names.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- find_names.c        22 Sep 2008 14:47:54 -0000      1.55
+++ find_names.c        29 Sep 2008 02:09:42 -0000      1.56
@@ -391,6 +391,12 @@
 
     /* sort the list into alphabetical order and return it */
     sortlist (dirlist, fsortcmp);
+
+    if (trace >= TRACE_MINUTIA)
+    {
+       TRACE (TRACE_MINUTIA, "Find_Directories returning dirlist:");
+       printlist (dirlist);
+    }
     return dirlist;
 }
 

Index: hash.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/hash.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- hash.h      19 Aug 2006 15:42:19 -0000      1.24
+++ hash.h      29 Sep 2008 02:09:42 -0000      1.25
@@ -70,5 +70,6 @@
 void freenode (Node *p);
 void sortlist (List *list, int (*)(const Node *, const Node *));
 int fsortcmp (const Node *p, const Node *q);
+void printlist (List *list);
 
 #endif /* HASH_H */

Index: ls.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ls.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- ls.c        12 Sep 2007 17:27:23 -0000      1.23
+++ ls.c        29 Sep 2008 02:09:42 -0000      1.24
@@ -460,6 +460,9 @@
     Dtype retval;
     Node *p;
 
+    TRACE (TRACE_FUNCTION, "ls_direntproc (%s, %s, %s)",
+          dir, repos, update_dir);
+
     /* Due to the way we called start_recursion() from ls_proc() with a single
      * argument at a time, we can assume that if we don't yet have a parent
      * directory in DIRS then this directory should be processed.

Index: recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- recurse.c   28 Sep 2008 04:39:49 -0000      1.135
+++ recurse.c   29 Sep 2008 02:09:42 -0000      1.136
@@ -619,11 +619,7 @@
     int locktype;
     bool process_this_directory = true;
 
-#ifdef HAVE_PRINT_PTR
-    TRACE (TRACE_FLOW, "do_recursion ( frame=%p )", (void *) frame);
-#else
-    TRACE (TRACE_FLOW, "do_recursion ( frame=%lx )", (unsigned long) frame);
-#endif
+    TRACE (TRACE_FLOW, "do_recursion (%s)", frame->repository);
 
     /* do nothing if told */
     if (frame->flags == R_SKIP_ALL)
@@ -890,13 +886,7 @@
        free (srepository);
     repository = NULL;
 
-#ifdef HAVE_PRINT_PTR
-    TRACE (TRACE_FLOW, "Leaving do_recursion (frame=%p)", (void *)frame);
-#else
-    TRACE (TRACE_FLOW, "Leaving do_recursion (frame=%lx)",
-          (unsigned long)frame);
-#endif
-
+    TRACE (TRACE_FLOW, "Leaving do_recursion (%s)", frame->repository);
     return err;
 }
 
@@ -925,6 +915,8 @@
     int ret;
     char *tmp;
 
+    TRACE (TRACE_FLOW, "do_file_proc (%s, %s)", finfo->update_dir, p->key);
+
     finfo->file = p->key;
     tmp = dir_append (finfo->update_dir, finfo->file);
 
@@ -985,6 +977,8 @@
     char *saved_update_dir;
     bool process_this_directory = true;
 
+    TRACE (TRACE_FLOW, "do_dir_proc (%s, %s)", update_dir, p->key);
+
     if (fncmp (dir, CVSADM) == 0)
     {
        /* This seems to most often happen when users (beginning users,