DistRen Changeset - 7d6ab92dff30 · protofusion repositories

Changeset - 7d6ab92dff30

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca (ethanzonca) - 15 years ago 2010-09-13 20:08:02
e@ethanzonca.com

commit for binki

1 file changed with 11 insertions and 2 deletions:

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -37,32 +37,39 @@ @@
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <time.h>
 // Function debug
-#define DEBUG 0
+#define DEBUG 1
+/*
 void stringToUpper(char *string){
   while(*string != '\0') {
     *string = toupper((unsigned char)*string);
+  }
+}
 */
 void stringToUpper(char *buffer){
     for(; *buffer; buffer ++)
       *buffer = toupper(*buffer);
+}
 /**
    Grabs the xml DOM node reached by an XPath.
    @param path an XPath that lead to DOM node
    @return the first node associated with the path or NULL if there is no match
  */
 xmlNodePtr xml_quickxpath(xmlXPathContextPtr xpathctxt, xmlChar *path)
+{
   xmlNodePtr toreturn;
   xmlXPathObjectPtr xmlxpathobjptr;
@@ @@ -709,24 +716,26 @@ int _web_getwork(int slavekey, char *sla @@
         return 0; // no work
       *xres = atoi(tmp);
       tmp = strtok (NULL, ",");
       if(tmp == NULL)
         return 0; // no work
       *yres = atoi(tmp);
       tmp = strtok (NULL, ",");
       if(tmp == NULL)
         return 0; // no work
       outputext = tmp;
       if(DEBUG)
         fprintf(stderr,"GETWORK Debug output - Job: %d | Frame: %d | Xres: %d | Yres: %d | Outformat: %s\n", *jobnum, *framenum, *xres, *yres, outputext);
       // @FIXME: Setting outputext and serverversion = temp; will this cause issues as these are pointers to parts of the original temp var?
       // @TODO: This should be called every time, not just on fail.
       if(strcmp(PACKAGE_VERSION,serverversion)){
         fprintf(stderr,"Your distren package is out of date! Please acquire a newer version. (%s local vs %s remote)\n", PACKAGE_VERSION, serverversion);
         return 0;
+      }
       if(DEBUG)
         fprintf(stderr,"Software versions: %s local vs %s remote\n", PACKAGE_VERSION, serverversion);

0 comments (0 inline, 0 general)