[GNUnet-SVN] r242 - in GNUnet/src: applications/dht/tools applications/sqstore_mysql transports

[grothoff]

Author: grothoff
Date: 2005-02-11 14:16:30 -0800 (Fri, 11 Feb 2005)
New Revision: 242

Modified:
   GNUnet/src/applications/dht/tools/dht_api.c
   GNUnet/src/applications/sqstore_mysql/mysql.c
   GNUnet/src/transports/tcp.c
   GNUnet/src/transports/tcp6.c
Log:
fixes

Modified: GNUnet/src/applications/dht/tools/dht_api.c
===================================================================
--- GNUnet/src/applications/dht/tools/dht_api.c 2005-02-11 21:48:37 UTC (rev 
241)
+++ GNUnet/src/applications/dht/tools/dht_api.c 2005-02-11 22:16:30 UTC (rev 
242)
@@ -352,7 +352,6 @@
       }
        
       case DHT_CS_PROTO_REQUEST_ITERATE: {
-       DHT_CS_REPLY_RESULTS * reply;
        DHT_CS_REQUEST_ITERATE * req;
        int resCount;
 
@@ -371,10 +370,9 @@
        resCount = list->store->iterate(list->store->closure,
                                        &sendAllResults,
                                        list);
-       if ( (resCount != SYSERR) &&
-            (OK != sendAck(list->sock,
-                           &list->table,
-                           resCount)) ) {
+       if (OK != sendAck(list->sock,
+                                         &list->table,
+                                         resCount)) {
          LOG(LOG_WARNING,
              _("Failed to send '%s'.  Closing connection.\n"),
              "ACK");
@@ -383,7 +381,6 @@
          list->sock = NULL;
          MUTEX_UNLOCK(&list->lock);
        }
-       FREE(reply);
        break;
       }
 

Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c       2005-02-11 21:48:37 UTC 
(rev 241)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c       2005-02-11 22:16:30 UTC 
(rev 242)
@@ -649,11 +649,21 @@
        _("'%s' failed at %s:%d with error: %s\n"),
        "mysql_stmt_bind_result",
        __FILE__, __LINE__,
-       mysql_stmt_error(dbh->insert));    
+       mysql_stmt_error(stmt));    
     MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
     FREE(datum);
     return SYSERR;
   }
+  if (mysql_stmt_store_result(stmt)) {
+    LOG(LOG_ERROR,
+               _("'%s' failed at %s:%d with error: %s\n"),
+               "mysql_stmt_store_result",
+               __FILE__, __LINE__,
+               mysql_stmt_error(stmt));    
+    MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
+    FREE(datum);
+    return SYSERR;
+  }
   datasize = MAX_DATUM_SIZE;
   count = 0;
   while (mysql_stmt_fetch(stmt)) {
@@ -742,10 +752,10 @@
   if (mysql_stmt_bind_param(dbh->insert,
                            dbh->bind)) {
     LOG(LOG_ERROR,
-       _("'%s' failed at %s:%d with error: %s\n"),
-       "mysql_stmt_bind_param",
-       __FILE__, __LINE__,
-       mysql_stmt_error(dbh->insert));    
+               _("'%s' failed at %s:%d with error: %s\n"),
+               "mysql_stmt_bind_param",
+               __FILE__, __LINE__,
+               mysql_stmt_error(dbh->insert));    
     MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
     return SYSERR;
   } 
@@ -753,10 +763,10 @@
 
   if (mysql_stmt_execute(dbh->insert)) {
     LOG(LOG_ERROR,
-       _("'%s' failed at %s:%d with error: %s\n"),
-       "mysql_stmt_execute",
-       __FILE__, __LINE__,
-       mysql_stmt_error(dbh->insert));    
+               _("'%s' failed at %s:%d with error: %s\n"),
+               "mysql_stmt_execute",
+               __FILE__, __LINE__,
+               mysql_stmt_error(dbh->insert));    
     MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
     return SYSERR;
   }  
@@ -980,15 +990,8 @@
  * guaranteed to be unloading of the module.
  */
 static void drop() {
-  char * scratch;
-  
-  scratch = MALLOC(128);
-  SNPRINTF(scratch,
-          128,
-          "DROP TABLE gn070"); 
   mysql_query(dbh->dbf,
-             scratch);
-  FREE(scratch);
+                         "DROP TABLE gn070");
 }
 
 

Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2005-02-11 21:48:37 UTC (rev 241)
+++ GNUnet/src/transports/tcp.c 2005-02-11 22:16:30 UTC (rev 242)
@@ -794,13 +794,13 @@
                               mp,
                               ssize,
                               &ret);
+       if (success == SYSERR) {
+         LOG_STRERROR(LOG_INFO, "send");
+         MUTEX_UNLOCK(&tcplock);
+         return SYSERR;
+       } else if (success == NO)
+         ret = 0;
   }
-  if (success == SYSERR) {
-    LOG_STRERROR(LOG_INFO, "send");
-    MUTEX_UNLOCK(&tcplock);
-    return SYSERR;
-  } else if (success == NO)
-    ret = 0;
   if ((unsigned int)ret <= ssize) { /* some bytes send or blocked */
     if ((unsigned int)ret < ssize) {
       if (tcpSession->wbuff == NULL) {

Modified: GNUnet/src/transports/tcp6.c
===================================================================
--- GNUnet/src/transports/tcp6.c        2005-02-11 21:48:37 UTC (rev 241)
+++ GNUnet/src/transports/tcp6.c        2005-02-11 22:16:30 UTC (rev 242)
@@ -813,13 +813,13 @@
                               mp,
                               ssize,
                               &ret);
+       if (success == SYSERR) {
+         LOG_STRERROR(LOG_INFO, "send");
+         MUTEX_UNLOCK(&tcp6lock);
+         return SYSERR;
+       } else if (success == NO)
+         ret = 0;
   }
-  if (success == SYSERR) {
-    LOG_STRERROR(LOG_INFO, "send");
-    MUTEX_UNLOCK(&tcp6lock);
-    return SYSERR;
-  } else if (success == NO)
-    ret = 0;
   if ((unsigned int) ret <= ssize) { /* some bytes send or blocked */
     if ((unsigned int)ret < ssize) {
       if (tcp6Session->wbuff == NULL) {