DistRen Changeset - 9deea2412c84 · protofusion repositories

Changeset - 9deea2412c84

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2010-02-19 22:50:29
ohnobinki@ohnopublishing.net

fix mysqlResultFree() segfault issue, actually works finally :-D

1 file changed with 5 insertions and 1 deletions:

src/server/mysql.c

0 comments (0 inline, 0 general)

src/server/mysql.c

➞

Show inline comments

@@ @@ -194,110 +194,114 @@ distrend_mysql_result_t mysqlQuery(distr @@
   if(num_columns != expected_columns)
+    {
       fprintf(stderr, "Expected %d columns, got %d for ``%s''\n", expected_columns, num_columns, query);
       mysql_free_result(result);
       return NULL;
+    }
   fprintf(stderr,"Done!\n");
   /**
      Prepare data for return.
    */
   distrenresult = malloc(sizeof(struct distrend_mysql_result));
   if(!distrenresult)
+    {
       while(mysql_fetch_row(result))
+	;
       mysql_free_result(result);
       return NULL;
+    }
   distrenresult->mysqlresult = result;
   distrenresult->pointlesscheck = FORTY_TWO;
   return distrenresult;
+}
 int mysqlResultFree(distrend_mysql_conn_t conn, distrend_mysql_result_t result)
+{
   size_t counter;
   MYSQL_RES *mysqlresult;
   if(!result)
+    {
       fprintf(stderr, "mysqlResultFree(): warning, passed NULL parameter\n");
       return 0;
+    }
   if(result->pointlesscheck != FORTY_TWO)
     fprintf(stderr, "%s:%d: I didn't get the type of handle I wanted\n", __FILE__, __LINE__);
   mysqlresult = result->mysqlresult;
   free(result);
   /**
      Must flush the resultset buffer.
    */
   for(counter = 0;
-      mysql_fetch_row(result->mysqlresult);
       mysql_fetch_row(mysqlresult);
       counter ++)
+    ;
   if(counter)
     fprintf(stderr, "Calling function did not flush %d rows\n", (int)counter);
   while(mysql_more_results(conn->mysqlconn))
+    {
       fprintf(stderr, "flushing an extraneous result set\n");
       mysql_next_result(conn->mysqlconn);
       mysqlresult = mysql_use_result(conn->mysqlconn);
       if(mysqlresult)
+	{
       while(mysql_fetch_row(mysqlresult))
+	;
       mysql_free_result(mysqlresult);
+    }
+    }
   return 0;
+}
 /*
    Individual query functions:
  */
 void finish_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum)
+{
   char *query;
   _distren_asprintf(&query, "CALL `distren`.`Frame_Complete`(%d,%d,%d);", slavekey, jobkey, framenum);
   mysqlQuery(conn, query, 0);
   free(query);
+}
 void start_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum)
+{
   char *query;
   _distren_asprintf(&query, "CALL `distren`.`Frame_Start`(%d,%d,%d);", slavekey, jobkey, framenum);
   mysqlQuery(conn, query, 0);
   free(query);
+}
 int change_job_priority(distrend_mysql_conn_t conn, int32_t jobkey, int32_t newpriority)
+{
   char *query;
   _distren_asprintf(&query, "UPDATE `distren`.`Job` SET `Priority`=%d WHERE `Job_Key`=%d",
 		    newpriority, jobkey);
   mysqlQuery(conn, query, 0);
   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;
   int rtn;
   _distren_asprintf(&query, "CALL `distren`.`Frame_Get`(%d);", slavekey);

0 comments (0 inline, 0 general)