DistRen Changeset - 01df221c59bf · protofusion repositories

Changeset - 01df221c59bf

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Ethan Zonca (ethanzonca) - 16 years ago 2010-02-18 23:53:01
e@ethanzonca.com

Added return types for null columns

2 files changed with 11 insertions and 9 deletions:

src/server/distrend.c

src/server/mysql.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -423,50 +423,52 @@ int interactiveTest(int test, struct gen @@
   fprintf(stderr,"Hello!\n");
   int32_t slaveKey = 1;
   jobnum_t jobKey = 0;
   int32_t frameNum = 0;
   int32_t newPriority = 0;
   int tmp = 0;
   while(test == 1)
+   {
      fprintf(stderr, "Welcome to DistRen Alpha Interactive Test Mode\n\n");
      fprintf(stderr, "\t1 \tGet a frame to render\n");
      fprintf(stderr, "\t2 \tChange job priority\n");
      fprintf(stderr, "\t3 \tSet frame finished\n");
      fprintf(stderr, "\t4 \tSet frame started\n");
      fprintf(stderr, "\t5 \tQuit\n");
      scanf("%d", &command);
      switch(command)
+     {
      case 1:
        fprintf(stderr,"Slave Key: ");
        scanf("%d", &slaveKey);
        fprintf(stderr, "Got frame: ");
        find_jobframe(conn, slaveKey, &jobKey, &frameNum);
        fprintf(stderr, "jobKey: %d, frameNum: %d\n",jobKey,frameNum);
        if(find_jobframe(conn, slaveKey, &jobKey, &frameNum))
          fprintf(stderr,"No frames available to render!\n");
        else
          fprintf(stderr, "jobKey: %d, frameNum: %d\n",jobKey,frameNum);
        break;
      case 2:
        fprintf(stderr,"Job key: ");
        scanf("%d", &tmp);
        jobKey = tmp;
        fprintf(stderr,"New priority: ");
        scanf("%d", &tmp);
        newPriority = tmp;
        change_job_priority(conn, jobKey, newPriority);
        fprintf(stderr,"Changed!");
        break;
      case 3:
        fprintf(stderr,"Slave Key: ");
        scanf("%d", &tmp);
        slaveKey = tmp;
        fprintf(stderr,"Job Key: ");
        scanf("%d", &tmp);
        jobKey = tmp;
        fprintf(stderr,"Frame Number: ");
        scanf("%d", &tmp);

src/server/mysql.c

➞

Show inline comments

@@ @@ -39,51 +39,53 @@ @@
 #define FORTY_TWO 42
 /**
    performs mysql query.
    errors will be logged to the user by this function.
    @return pointer to query handle on success, NULL on failure or if expected_columns=0 (no result set expected)
  */
 distrend_mysql_result_t mysqlQuery(distrend_mysql_conn_t conn, char *query, MYSQL_FIELD_OFFSET expected_columns);
 /**
    frees mysql query result. Accepts a NULL pointer and ignores it to
    help deal with one-shot calls to mysqlQuery so that you don't have to
    check if it returned NULL or not.
    @return 0 on success
  */
 int mysqlResultFree(distrend_mysql_result_t result);
 /**
    reads an integer mysql field value
    @return 0 on success
 */
 int distrend_mysql_getint(MYSQL_ROW row, MYSQL_FIELD_OFFSET column, int32_t *theint)
+{
 if(!row[0] || !row[1])
   fprintf(stderr, "Columns are null!\n");
   *theint = atol(row[column]);
   // no frames to render
   if(!row[0] || !row[1])
     return 1;
   else
     *theint = atol(row[column]);
   return 0;
+}
 struct distrend_mysql_conn
+{
   MYSQL *mysqlconn;
   short pointlesscheck;
 };
 struct distrend_mysql_result
+{
   MYSQL_RES *mysqlresult;
   short pointlesscheck;
 };
 /**
     funcs
  */
 int mysqlConnect(distrend_mysql_conn_t *conn)
+{
   MYSQL *mysqlconn;
@@ @@ -253,33 +255,31 @@ int change_job_priority(distrend_mysql_c @@
   return 0;
+}
 int find_jobframe(distrend_mysql_conn_t conn, int32_t slavekey, jobnum_t *jobkey, int32_t *framenum)
+{
   distrend_mysql_result_t result;
   char *query;
   MYSQL_ROW row;
   _distren_asprintf(&query, "CALL `distren`.`Frame_Get`(%d);", slavekey);
   result = mysqlQuery(conn, query, 2);
   free(query);
   if(!result)
     return 1;
   row = mysql_fetch_row(result->mysqlresult);
   if(!row)
+    {
       mysqlResultFree(result);
       return 1;
+    }
   distrend_mysql_getint(row, 0, (int32_t *)jobkey);
   distrend_mysql_getint(row, 1, framenum);
   if(distrend_mysql_getint(row, 0, (int32_t *)jobkey) || distrend_mysql_getint(row, 1, framenum))
     return 1;
   mysqlResultFree(result);
   return 0;
+}

0 comments (0 inline, 0 general)