DistRen Changeset - f7a90d38ac0f · protofusion repositories

Changeset - f7a90d38ac0f

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2009-10-10 13:00:18
ohnobinki@ohnopublishing.net

prepare_distrenjob(): malloc() frameset, handle errors

1 file changed with 14 insertions and 3 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -236,28 +236,37 @@ int restoreJobState(struct distrenjob *j @@
+    }
   return isJobDone;
+}
 /** creates a structure from starting data, then calls another function to actually add that struct to the queue */
-void prepare_distrenjob(struct distrenjob *head, int type, char *name, char *submitter, char *email, int priority, int start_frame, int end_frame, int width, int height)
+int prepare_distrenjob(struct distrenjob *head, int type, char *name, char *submitter, char *email, int priority, int start_frame, int end_frame, int width, int height)
+{
   int counter2;
   int counter;
   int tmp;
   struct distrenjob *distrenjob;
   distrenjob_new(&distrenjob);
   tmp = distrenjob_new(&distrenjob);
   if(tmp)
     return 1;
   distrenjob->type = 1;
   distrenjob->name = name;
   distrenjob->submitter = submitter;
   distrenjob->email = email;
   distrenjob->priority = priority;
   distrenjob->width = width;
   distrenjob->height = height;
   distrenjob->total_frames = (end_frame - start_frame + 1); // sets the total number of frames in animation for status purposes
   distrenjob->total_frames = (end_frame - start_frame + 1); /* sets the total number of frames in animation for status purposes */
   distrenjob->frameset = malloc(sizeof(struct frameset) * distrenjob->total_frames);
   if(!distrenjob->frameset)
+    {
       distrenjob_free(&distrenjob);
       return 1;
+    }
   /* prepares all the frames by setting that status to "unassigned" */
   counter2 = start_frame;
   for(counter = 0; counter <= (end_frame- start_frame + 1); counter++){
     distrenjob->frameset[counter].num = counter2;
     distrenjob->frameset[counter].status = FRAMESETSTATUS_UNASSIGNED;
@@ @@ -269,12 +278,14 @@ void prepare_distrenjob(struct distrenjo @@
   makeJobDataXML(distrenjob);
   distrenjob_enqueue(head, distrenjob);
   general_info.jobs_in_queue++;
   updateJobListXML(head);
   updateGeneralInfo();
   return 0;
+}
 /** distrenjob_enqueue: This function adds the job to the queue based on its priority */
 void distrenjob_enqueue(struct distrenjob *head, struct distrenjob *job) {
   struct distrenjob *prev_job = head; // create pointer to previous job

0 comments (0 inline, 0 general)