# HG changeset patch
# User normaldotcom <e@ethanzonca.com>
# Date 2010-09-03 00:11:31
# Node ID 8c97631a877dfb12e8057c1026cd727c3b22abcf
# Parent  86de9c9f23c54bcf4ab13ceb189f98ae2a99b2b6

Cleaned up cmdline output

diff --git a/src/server/simpleslave.c b/src/server/simpleslave.c
--- a/src/server/simpleslave.c
+++ b/src/server/simpleslave.c
@@ -202,7 +202,7 @@ if(updateConf){
     }
 
   if(!DEBUG)
-    fprintf(stderr, "Running..");
+    fprintf(stderr, "Running...");
   // Main loop
   while(!quit)
     {
@@ -215,7 +215,7 @@ if(updateConf){
     /* If we got a frame */
     if(haveWork)
       {
-        fprintf(stderr,"Got work from server...\n");
+        fprintf(stderr,"\nGot work from server...\n");
         if(DEBUG)
           fprintf(stderr, "Preparing to render frame %d in job %d\n", framenum, jobnum);
 
diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c
--- a/src/server/slavefuncs.c
+++ b/src/server/slavefuncs.c
@@ -376,7 +376,8 @@ int downloadTar(char *url, char *destina
         return 1; // Eventually make a retry loop
       }
     }
-  fprintf(stderr, "Tar at %s already exists! Download cancelled.\n", destinationPath);
+  if(DEBUG)
+    fprintf(stderr, "Tar at %s already exists! Download cancelled.\n", destinationPath);
   return 2;
 }
 
@@ -388,7 +389,7 @@ int uploadOutput(char *pathtoOutput, cha
       if(DEBUG)
         fprintf(stderr,"Upload successful, removing old output...\n");
       else
-        fprintf(stderr,"Upload completed\n");
+        fprintf(stderr,"Uploaded\n");
 
       remove(pathtoOutput); // Delete the file after its uploaded
       return 0;
@@ -615,7 +616,8 @@ void _web_finishframe(int slavekey, char
   struct _web_memorystruct data = _web_getrequest(url);
   free(url);
 
-  fprintf(stderr,"%s\n", data.memory);
+  if(DEBUG)
+    fprintf(stderr,"%s\n", data.memory);
   if(data.memory)
     free(data.memory);
 }
@@ -627,7 +629,8 @@ void _web_resetframe(int slavekey, char 
   struct _web_memorystruct data = _web_getrequest(url);
   free(url);
 
-  fprintf(stderr,"%s\n", data.memory);
+  if(DEBUG)
+    fprintf(stderr,"%s\n", data.memory);
   if(data.memory)
     free(data.memory);
 }
@@ -640,7 +643,8 @@ void _web_startframe(int slavekey, char 
   struct _web_memorystruct data = _web_getrequest(url);
   free(url);
 
-  fprintf(stderr,"%s\n", data.memory);
+  if(DEBUG)
+    fprintf(stderr,"%s\n", data.memory);
   if(data.memory)
     free(data.memory);
 }
@@ -706,7 +710,8 @@ void _web_setrenderpower(int slavekey, c
   struct _web_memorystruct data = _web_getrequest(url);
   free(url);
 
-  fprintf(stderr,"%s\n", data.memory);
+  if(DEBUG)
+    fprintf(stderr,"%s\n", data.memory);
   if(data.memory)
     free(data.memory);
 }