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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     07/09/12 19:38:04

Modified files:
        src            : ChangeLog server.c server.h 

Log message:
        * server.h (TRACE_MINUTIA): Add new trace level.
        * server.c (cvs_trace_i, cvs_trace_ia): New internal functions.
        (cvs_trace): Trace the PWD when tracing minutia.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3543&r2=1.3544
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/server.c?cvsroot=cvs&r1=1.481&r2=1.482
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/server.h?cvsroot=cvs&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3543
retrieving revision 1.3544
diff -u -b -r1.3543 -r1.3544
--- ChangeLog   12 Sep 2007 19:20:25 -0000      1.3543
+++ ChangeLog   12 Sep 2007 19:38:04 -0000      1.3544
@@ -1,5 +1,9 @@
 2007-09-12  Derek Price  <address@hidden>
 
+       * server.h (TRACE_MINUTIA): Add new trace level.
+       * server.c (cvs_trace_i, cvs_trace_ia): New internal functions.
+       (cvs_trace): Trace the PWD when tracing minutia.
+
        * sanity.sh (edit-check): Update to compensate for quoting introduce
        by last commit.
 

Index: server.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/server.c,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -b -r1.481 -r1.482
--- server.c    12 Sep 2007 18:27:08 -0000      1.481
+++ server.c    12 Sep 2007 19:38:04 -0000      1.482
@@ -43,7 +43,7 @@
 
 
 int server_active = 0;
-int trace = 0;
+enum trace_level trace = TRACE_NONE;
 
 #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
 # include "log-buffer.h"
@@ -8460,22 +8460,12 @@
 
 
 
-/*
- * void cvs_trace(int level, const char *fmt, ...)
- *
- * Print tracing information to stderr on request.  Levels are implemented
- * as with CVSNT.
- */
-void
-cvs_trace (int level, const char *fmt, ...)
+static void
+cvs_trace_i (const char *fmt, va_list va)
 {
-    if (trace >= level)
-    {
-       va_list va;
        char *buf;
        int size;
 
-       va_start (va, fmt);
 #ifdef SERVER_SUPPORT
        cvs_outerr (server_active ? (isProxyServer() ? "P" : "S") : " ", 1);
 #else
@@ -8486,6 +8476,38 @@
            abort ();
        cvs_outerr (buf, size);
        cvs_outerr ("\n", 1);
+}
+
+
+
+static inline void
+cvs_trace_ia (const char *fmt, ...)
+{
+    va_list va;
+    va_start (va, fmt);
+    cvs_trace_i (fmt, va);
+    va_end (va);
+}
+
+
+
+/*
+ * void cvs_trace(int level, const char *fmt, ...)
+ *
+ * Print tracing information to stderr on request.  Levels are implemented
+ * as with CVSNT.
+ */
+void
+cvs_trace (enum trace_level level, const char *fmt, ...)
+{
+    if (trace >= TRACE_MINUTIA)
+       cvs_trace_ia ("CWD = %s", xgetcwd());
+
+    if (trace >= level)
+    {
+       va_list va;
+       va_start (va, fmt);
+       cvs_trace_i (fmt, va);
        va_end (va);
     }
 }

Index: server.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/server.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server.h    12 Jun 2006 14:33:02 -0000      1.48
+++ server.h    12 Sep 2007 19:38:04 -0000      1.49
@@ -214,11 +214,10 @@
 
 
 
-/* The TRACE macro */
-extern int trace;              /* User defined trace level.  */
-void cvs_trace (int level, const char *fmt, ...)
-  __attribute__ ((__format__ (__printf__, 2, 3)));
-#define TRACE cvs_trace
+/***
+ *** The TRACE macro
+ ***/
+
 /* Trace levels:
  *
  * TRACE_FUNCTION      Trace function calls, often including function
@@ -228,10 +227,22 @@
  *                     start_recursion, do_recursion, and walklist in the
  *                     function traces.
  * TRACE_DATA          Trace important internal function data.
+ * TRACE_MINUTIA       Trace certain things every call to trace.  Currently,
+ *                      this is only the CWD.
  */ 
-#define TRACE_FUNCTION         1
-#define TRACE_FLOW             2
-#define TRACE_DATA             3
+enum trace_level
+{
+    TRACE_NONE = 0,
+    TRACE_FUNCTION,
+    TRACE_FLOW,
+    TRACE_DATA,
+    TRACE_MINUTIA
+};
+
+extern enum trace_level trace;         /* User defined trace level.  */
+void cvs_trace (enum trace_level level, const char *fmt, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));
+#define TRACE cvs_trace