Changeset 14 in libcf for trunk/src/cf_debug.c

Timestamp:

01/31/13 22:55:37 (11 years ago)

Author:

cheese

Message:

#1 add test code and fix debug and logging error

File:

• trunk/src/cf_debug.c (modified) (6 diffs)

trunk/src/cf_debug.c

@@ -49 +49 @@
 } S_CF_DEBUG_CTX, CF_DEBUG_CTX;
 
-void
+int
 CF_Debug_Local_Print (CF_DEBUG_CTX  * ctx,
                       const char    * fmt,
                       va_list       valist)
 {
-    fprintf (GET_CTX_OSTREAM (ctx), "[DEBUG][%s %s(%d)] ",
+    fprintf (GET_CTX_OSTREAM (ctx), "[DEBUG][%s:%d][%s] ",
                                     ctx->file,
-                                    ctx->func,
-                                    ctx->line);
+                                    ctx->line,
+                                    ctx->func);
     vfprintf (GET_CTX_OSTREAM (ctx), fmt, valist);
+
+    return CF_OK;
 }
 
@@ -129 +131 @@
         return CF_ERROR_DEBUG_SET_OUTPUT_FD;
     }
+
+    return CF_OK;
+}
+
+int
+CF_Debug_UpdateCtx (CF_Debug_Ctx    ctx,
+                    const char      * file,
+                    const char      * func,
+                    const int       line)
+{
+    CF_DEBUG_CTX * context = (CF_DEBUG_CTX *) ctx;
+
+    CHECK_INVALID_CTX (ctx);
+
+    strncpy (context->file, file, strlen (file));
+    strncpy (context->func, func, strlen (func));
+    context->line = line;
 
     return CF_OK;
@@ -154 +173 @@
                    const char           * fmt, ...)
 {
-    int             i, j;
-    va_list         valist;
-    FILE            * fp = GET_CTX_OSTREAM (ctx);
-
-    CHECK_INVALID_CTX (ctx);
+    int     i, j;
+    va_list valist;
+    FILE    * fp = NULL;
+
+    CHECK_INVALID_CTX (ctx);
+    fp = GET_CTX_OSTREAM (ctx); 
 
     va_start (valist, fmt);
@@ -210 +230 @@
     context->callstack.caller = push;
 
-    /* set current context */
-    sprintf (context->file, "%s", file);
-    sprintf (context->func, "%s", func);
-    context->line = line;
+    CF_Debug_UpdateCtx (ctx, file, func, line);
 
     return CF_OK;
@@ -233 +250 @@
     if (callstack != NULL)
     {
+        sprintf (callstack->file    , "%s", pop->file);
         sprintf (callstack->function, "%s", pop->func);
         callstack->line = pop->line;
@@ -244 +262 @@
     if (pop->caller != NULL)
     {
-        sprintf (context->file, "%s", pop->caller->file);
-        sprintf (context->func, "%s", pop->caller->func);
-        context->line = pop->caller->line;
-        context->callstack.caller = pop->caller;
-    }
-
+        CF_Debug_UpdateCtx (ctx,
+                            pop->caller->file,
+                            pop->caller->func, 
+                            pop->caller->line);
+    }
+
+    context->callstack.caller = pop->caller;
     free (pop);