Changeset 6602 for pymolproxy

Timestamp:

Nov 10, 2016 6:05:35 PM (8 years ago)

Author:

ldelgass

Message:

debug message cleanup

File:

• pymolproxy/trunk/pymolproxy.c (modified) (11 diffs)

pymolproxy/trunk/pymolproxy.c

@@ -273 +273 @@
 
     if (debug) {
-        DEBUG("%s\n", message);
+        DEBUG("%s", message);
     } else {
         syslog(priority, message, length);
@@ -1857 +1857 @@
     if (result != TCL_OK) {
 #if EXEC_DEBUG
-        DEBUG("result was %s\n", Tcl_GetString(Tcl_GetObjResult(interp)));
+        DEBUG("result was %s", Tcl_GetString(Tcl_GetObjResult(interp)));
 #endif
     }
@@ -2105 +2105 @@
 
 #if DEBUG
-    DEBUG("Entering InitProxy\n");
+    DEBUG("Entering InitProxy");
 #endif
     /* Create two pipes for communication with the external application. One
@@ -2122 +2122 @@
     child = fork();
     if (child < 0) {
-        ERROR("can't fork process: %s\n", strerror(errno));
+        ERROR("can't fork process: %s", strerror(errno));
         return -3;
     }
@@ -2167 +2167 @@
 
 #if DEBUG
-    DEBUG("Started %s DISPLAY=%s\n", argv[0], getenv("DISPLAY"));
+    DEBUG("Started %s DISPLAY=%s", argv[0], getenv("DISPLAY"));
 #endif
     /* close opposite end of pipe, these now belong to the child process  */
@@ -2194 +2194 @@
         for (cp = cmdProcs; cp->name != NULL; cp++) {
 #if DEBUG
-            DEBUG("Adding command %s\n", cp->name);
+            DEBUG("Adding command %s", cp->name);
 #endif
             Tcl_CreateCommand(interp, cp->name, cp->proc, p, NULL);
@@ -2287 +2287 @@
             status = GetLine(&p->client, &numBytes, &line);
             if (status != BUFFER_OK) {
-                ERROR("can't read client stdout (numBytes=%d): %s\n", numBytes,
+                ERROR("can't read client stdout (numBytes=%d): %s", numBytes,
                       strerror(errno));
                 goto done;
@@ -2371 +2371 @@
             }
 #if WRITE_DEBUG
-            DEBUG("Writer: line found is %s\n", line);
+            DEBUG("Writer: line found is \"%.*s\"", (int)len, line);
 #endif
             if (strncmp(line, "image follows: ", 15) != 0) {
@@ -2378 +2378 @@
             if (sscanf(line, "image follows: %d %s %d %d\n", &numBytes, cacheId,
                        &frameNum, &rockOffset) != 4) {
-                ERROR("can't get # bytes from \"%s\"", line);
+                ERROR("can't get # bytes from \"%.*s\"", (int)len, line);
                 DEBUG("Leaving Writer thread");
                 return NULL;
             }
 #if WRITE_DEBUG
-            DEBUG("found image line \"%.*s\"", numBytes, line);
+            DEBUG("found image line (%d bytes)", numBytes);
 #endif
             sprintf(header, "nv>image %d %s %d %d\n", numBytes, cacheId,
@@ -2389 +2389 @@
             hdrLength = strlen(header);
 #if WRITE_DEBUG
-            DEBUG("Queueing image numBytes=%d cacheId=%s, frameNum=%d, rockOffset=%d size=%d\n", numBytes, cacheId, frameNum, rockOffset, numBytes + hdrLength);
+            DEBUG("Queueing image numBytes=%d cacheId=%s, frameNum=%d, rockOffset=%d size=%d", numBytes, cacheId, frameNum, rockOffset, numBytes + hdrLength);
 #endif
             imgPtr = NewImage(&list, numBytes + hdrLength);
@@ -2445 +2445 @@
         ERROR("Short write on version string", strerror(errno));
     }
-    INFO("Starting pymolproxy (threaded version)");
+    DEBUG("Starting pymolproxy");
 
     InitProxy(&proxy, argv + 1);