[GNUnet-SVN] r5344 - GNUnet/src/applications/sqstore_sqlite

[gnunet]

Author: grothoff
Date: 2007-07-22 18:01:30 -0600 (Sun, 22 Jul 2007)
New Revision: 5344

Modified:
   GNUnet/src/applications/sqstore_sqlite/sqlite.c
Log:
db locked

Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c     2007-07-22 20:47:42 UTC 
(rev 5343)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c     2007-07-23 00:01:30 UTC 
(rev 5344)
@@ -495,8 +495,8 @@
           ret = sqlite3_column_int64 (stmt, 0);
           i = SQLITE_OK;
         }
+      sqlite3_finalize (stmt);
     }
-  sqlite3_finalize (stmt);
   if (i == SQLITE_BUSY)
     return SYSERR;
   if (i != SQLITE_OK)
@@ -742,7 +742,7 @@
             {
               LOG_SQLITE (handle,
                           GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
-                          "sqlite_query");
+                          "sqlite3_step");
               sqlite3_finalize (stmt);
               return SYSERR;
             }
@@ -886,6 +886,7 @@
       FREE (datum);
       count++;
     }
+  sqlite3_reset (stmt);
   sqlite3_finalize (stmt);
   if (count != SYSERR)
     {
@@ -997,7 +998,7 @@
   if (sq_prepare (dbh, scratch, &stmt) != SQLITE_OK)
     {
       LOG_SQLITE (handle,
-                  GE_ERROR | GE_ADMIN | GE_USER | GE_BULK, "sqlite_query");
+                  GE_ERROR | GE_ADMIN | GE_USER | GE_BULK, "sqlite_prepare");
       return SYSERR;
     }
   count = 0;
@@ -1050,6 +1051,7 @@
           count++;
         }
     }
+  sqlite3_reset (stmt);
   sqlite3_finalize (stmt);
   return count;
 }
@@ -1111,7 +1113,7 @@
           return NO;
         }
       LOG_SQLITE (dbh,
-                  GE_ERROR | GE_ADMIN | GE_USER | GE_BULK, "sqlite_query");
+                  GE_ERROR | GE_ADMIN | GE_USER | GE_BULK, "sqlite3_step");
       sqlite3_reset (stmt);
       return SYSERR;
     }