DistRen Changeset - 384331f8928e · protofusion repositories

Changeset - 384331f8928e

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

ethanzonca@localhost.localdomain - 16 years ago 2009-11-24 00:27:01
ethanzonca@localhost.localdomain

Added return to blender_exec

3 files changed with 7 insertions and 9 deletions:

src/server/slave.c

src/server/slavefuncs.c

src/server/slavefuncs.h

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -171,7 +171,10 @@ int main(int argc, char *argv[]) @@
         free(outputExt);
         /* Execute blender */
         exec_blender(pathtoJobfile, pathtoOutput, framenum); /* @TODO: This warning should be fixed :D */
         if(exec_blender(pathtoJobfile, pathtoOutput, framenum)){ /* @TODO: This warning should be fixed :D */
             fprintf(stderr,"Error running Blender. Check your installation and/or your PATH.");
             return 1;
+        }
         free(pathtoJobfile);
         /* When blender is finished, run this... */

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -213,7 +213,7 @@ return 1; // Success @@
 /* Executors */
 /** Executor function for Blender operations */
-void exec_blender(char *input, char *output, int frame)
+int exec_blender(char *input, char *output, int frame)
+{
   fprintf(stderr,"Preparing to execute...\n");
   int ret;
@@ @@ -240,12 +240,7 @@ void exec_blender(char *input, char *out @@
+    }
   execio_close(testrem);
   if(ret == 1){
     fprintf(stderr,"Error starting Blender. Check your path and installation.\n");
+  }
   else{
     fprintf(stderr,"Execution of Blender was successful.\n");
+  }
   return ret;
+}
 void xmlinit()

src/server/slavefuncs.h

➞

Show inline comments

@@ @@ -36,7 +36,7 @@ int ssh_keygen(); @@
 int register_user(char *username, char *email);
 int login_user(char *username);
 int conf_replace(char *username);
-void exec_blender(char *input, char *output, int frame);
+int exec_blender(char *input, char *output, int frame);
 void xmlinit();
 void xmlcleanup();

0 comments (0 inline, 0 general)