DistRen Changeset - e7e6ab77c542 · protofusion repositories

Changeset - e7e6ab77c542

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

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

various small mysql.c fixes

1 file changed with 9 insertions and 3 deletions:

src/server/mysql.c

0 comments (0 inline, 0 general)

src/server/mysql.c

➞

Show inline comments

@@ @@ -140,109 +140,115 @@ int mysqlDisconnect(distrend_mysql_conn_ @@
   mysql_server_end();
   free(conn);
   return 0;
+}
 distrend_mysql_result_t mysqlQuery(distrend_mysql_conn_t conn, char *query, MYSQL_FIELD_OFFSET expected_columns)
+{
   MYSQL_RES *result;
   distrend_mysql_result_t distrenresult;
   MYSQL_FIELD_OFFSET num_columns;
   /**
      pointless sanity check
   */
   if(conn->pointlesscheck != SEVENTY_FIVE)
     fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_conn...\n");
   /** make sure that connection is still alive
    */
   if(mysql_ping(conn->mysqlconn))
+    {
       fprintf(stderr, "MySQL connection broken, and reconnect is disabled!\n");
       fprintf(stderr, "mysql_ping() failed: %s\n", mysql_error(conn->mysqlconn));
       return NULL;
+    }
   fprintf(stderr,"Querying... ");
   if (mysql_query(conn->mysqlconn, query))
+    {
       fprintf(stderr, "calling mysql_query() resulted in: %s\n", mysql_error(conn->mysqlconn));
       return NULL;
+    }
   fprintf(stderr,"Queried!\n");
   fprintf(stderr,"Getting results... ");
   result = mysql_use_result(conn->mysqlconn);
   /**
      Flush stuff out when an empty set is expected.
    */
   if(!expected_columns)
+    {
       while(mysql_fetch_row(result))
+	;
       mysql_free_result(result);
       return NULL;
+    }
   /**
      Sanity check
    */
   num_columns = mysql_num_fields(result);
   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_result_t result)
+{
   size_t counter;
   if(!result)
     return 0;
+    {
       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__);
   /**
      Must flush the resultset buffer.
    */
   for(counter = 0;
       mysql_fetch_row(result->mysqlresult);
       counter ++)
+    ;
   if(counter)
     fprintf(stderr, "Calling function did not flush %d rows\n", (int)counter);
   mysql_free_result(result->mysqlresult);
   free(result);
   return 0;
+}
 /*
    Individual query functions:
  */
 void finish_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum)

0 comments (0 inline, 0 general)