DistRen Changeset - 4ee662095a59 · protofusion repositories

Changeset - 4ee662095a59

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 1 0

ethanzonca@protofusion.org - 16 years ago 2010-02-18 22:10:44
ethanzonca@protofusion.org

Merge

1 file changed with 18 insertions and 3 deletions:

src/server/mysql.c

0 comments (0 inline, 0 general)

src/server/mysql.c

➞

Show inline comments

@@ @@ -174,18 +174,30 @@ distrend_mysql_result_t mysqlQuery(distr @@
   return distrenresult;
+}
 int mysqlResultFree(distrend_mysql_result_t result)
+{
   size_t counter;
   if(!result)
     return 0;
   if(result->pointlesscheck != FORTY_TWO)
     fprintf(stderr, "%s:%d: I didn't get the type of handle I wanted\n", __FILE__, __LINE__);
   /**
      Must flush the resultset buffer.
    */
   for(counter = 0;
       mysql_fetch_row(result->mysqlresult);
       counter ++)
+    ;
   if(counter)
     fprintf(stderr, "Calling function did not flush all of the rows it should've\n");
   mysql_free_result(result->mysqlresult);
   free(result);
   return 0;
+}
@@ @@ -229,13 +241,13 @@ int change_job_priority(distrend_mysql_c @@
   result = mysqlQuery(conn, query);
   mysqlResultFree(result);
   return 0;
+}
 int find_jobframe(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum)
+int find_jobframe(distrend_mysql_conn_t conn, int32_t slavekey, int32_t *jobkey, int32_t *framenum)
+{
   distrend_mysql_result_t result;
   char *query;
   MYSQL_ROW row;
   _distren_asprintf(&query, "CALL `distren`.`Frame_Get`(%d);", slavekey);
@@ @@ -245,16 +257,19 @@ int find_jobframe(distrend_mysql_conn_t @@
   if(!result)
     return 1;
   row = mysql_fetch_row(result->mysqlresult);
   if(!row)
+    {
       mysqlResultFree(result);
     return 1;
+    }
   distrend_mysql_getint(row, 1, &jobkey);
   distrend_mysql_getint(row, 2, &framenum);
   distrend_mysql_getint(row, 0, jobkey);
   distrend_mysql_getint(row, 1, framenum);
   mysqlResultFree(result);
   return 0;

0 comments (0 inline, 0 general)