DistRen Changeset - 8d3babc6275c · protofusion repositories

Changeset - 8d3babc6275c

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca (ethanzonca) - 16 years ago 2010-02-21 13:52:35
e@ethanzonca.com

Fixed free calls

1 file changed with 3 insertions and 3 deletions:

src/server/mysql.c

0 comments (0 inline, 0 general)

src/server/mysql.c

➞

Show inline comments

@@ @@ -163,97 +163,97 @@ distrend_mysql_result_t mysqlQuery(distr @@
+    {
       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);
+        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(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);
+	}
+    }
@@ @@ -302,58 +302,58 @@ int find_jobframe(distrend_mysql_conn_t @@
   char *query;
   MYSQL_ROW row;
   int rtn;
   _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(conn, result);
       return 1;
+    }
   rtn = distrend_mysql_getint(row, 0, (int32_t *)jobkey);
   rtn += distrend_mysql_getint(row, 1, framenum);
   mysqlResultFree(conn, result);
   return rtn;
+}
 int auth_slave(distrend_mysql_conn_t conn, int32_t slavekey, int32_t slavepass)
+{
   distrend_mysql_result_t result;
   char *query;
   MYSQL_ROW row;
   int32_t *isAuth = 0;
   int rtn;
   _distren_asprintf(&query, "CALL `distren`.`Slave_Auth`(%d,%d);", slavekey, slavepass);
   result = mysqlQuery(conn, query, 2);
   free(query);
   if(!result)
     return 1;
   row = mysql_fetch_row(result->mysqlresult);
   if(!row)
+    {
       mysqlResultFree(result);
+      mysqlResultFree(conn, result);
       return 1;
+    }
   rtn = distrend_mysql_getint(row, 0, (int32_t *)isAuth);
   mysqlResultFree(result);
+  mysqlResultFree(conn, result);
   return rtn;
+}

0 comments (0 inline, 0 general)