am d00eba4: merge from open-source master

Merge commit 'd00eba458706a38f6c072ed90c5da35f3e3f1bba' into kraken * commit 'd00eba458706a38f6c072ed90c5da35f3e3f1bba': Add a printf format.
yoannsculo · May 12, 2010 · 0253ffd · 0253ffd
2 parents 42d3812 + d00eba4
commit 0253ffd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/logwrapper/logwrapper.c b/logwrapper/logwrapper.c
@@ -60,15 +60,15 @@ void parent(const char *tag, int seg_fault_on_exit, int parent_read) {
                 buffer[b] = '\0';
             } else if (buffer[b] == '\n') {
                 buffer[b] = '\0';
-                LOG(LOG_INFO, tag, &buffer[a]);
+                LOG(LOG_INFO, tag, "%s", &buffer[a]);
                 a = b + 1;
             }
         }
 
         if (a == 0 && b == sizeof(buffer) - 1) {
             // buffer is full, flush
             buffer[b] = '\0';
-            LOG(LOG_INFO, tag, &buffer[a]);
+            LOG(LOG_INFO, tag, "%s", &buffer[a]);
             b = 0;
         } else if (a != b) {
             // Keep left-overs
@@ -84,7 +84,7 @@ void parent(const char *tag, int seg_fault_on_exit, int parent_read) {
     // Flush remaining data
     if (a != b) {
         buffer[b] = '\0';
-        LOG(LOG_INFO, tag, &buffer[a]);
+	LOG(LOG_INFO, tag, "%s", &buffer[a]);
     }
     status = 0xAAAA;
     if (wait(&status) != -1) {  // Wait for child