Changeset 107 in libcf

Timestamp:

05/30/13 16:57:55 (11 years ago)

Author:

cheese

Message:

#1 change sprintf to snprintf and imporve performance of log

Location:

trunk/src

Files:

• cf_debug.c (modified) (2 diffs)
• cf_log.c (modified) (2 diffs)

trunk/src/cf_debug.c

@@ -225 +225 @@
 
     /* push to callstack */
-    sprintf (push->file, "%s", file);
-    sprintf (push->func, "%s", func);
+    snprintf (push->file, NAME_LENGTH, "%s", file);
+    snprintf (push->func, NAME_LENGTH, "%s", func);
     push->line = line;
     push->caller = context->callstack.caller;
@@ -260 +260 @@
     if (callstack != NULL)
     {
-        sprintf (callstack->file    , "%s", pop->file);
-        sprintf (callstack->function, "%s", pop->func);
+        snprintf (callstack->file    , NAME_LENGTH, "%s", pop->file);
+        snprintf (callstack->function, NAME_LENGTH, "%s", pop->func);
         callstack->line = pop->line;
     }

trunk/src/cf_log.c

@@ -307 +307 @@
                  va_list    valist)
 {
+#define BUF_LEN 16 * 1024
     CF_LOG_CTX  * context = (CF_LOG_CTX *) ctx;
 //  va_list     valist;
-    char        buffer[16 * 1024] = {0x00,};
+    char        buffer[BUF_LEN + 1] = {0x00,};
     char        datetime[LOG_DATETIME_LENGTH + 1] = {0x00,};
+    int         length = 0;
 
     ASSERT_CTX (ctx);
@@ -318 +320 @@
 
     CF_Log_Local_GetTimeString (datetime);
-    snprintf (buffer, sizeof (buffer) - 1, "[%s][%s] ", datetime, prefix);
-    vsprintf (buffer + strlen (buffer), fmt, valist);
+    length = snprintf (buffer, BUF_LEN, "[%s][%s] ", datetime, prefix);
+    vsnprintf (&buffer[length], BUF_LEN - (size_t)length, fmt, valist);
 
     CF_Log_Local_Push (context, buffer, strlen (buffer));