[65569] trunk/base/src/cregistry/registry.c

[raimue at macports.org]

Revision: 65569
          http://trac.macports.org/changeset/65569
Author:   raimue at macports.org
Date:     2010-03-27 19:38:37 -0700 (Sat, 27 Mar 2010)
Log Message:
-----------
cregistry: Avoid prepare_v2() for Tiger compatibility

Modified Paths:
--------------
    trunk/base/src/cregistry/registry.c

Modified: trunk/base/src/cregistry/registry.c
===================================================================
--- trunk/base/src/cregistry/registry.c	2010-03-28 02:16:46 UTC (rev 65568)
+++ trunk/base/src/cregistry/registry.c	2010-03-28 02:38:37 UTC (rev 65569)
@@ -196,13 +196,14 @@
     if (initialized || can_write) {
         sqlite3_stmt* stmt;
         char* query = sqlite3_mprintf("ATTACH DATABASE '%q' AS registry", path);
-        if (sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK) {
+        if (sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK) {
             int r;
             /* XXX: Busy waiting, consider using sqlite3_busy_handler/timeout */
             do {
-                r = sqlite3_step(stmt);
+                sqlite3_step(stmt);
+                r = sqlite3_reset(stmt);
                 switch (r) {
-                    case SQLITE_DONE:
+                    case SQLITE_OK:
                         if (initialized || (create_tables(reg->db, errPtr))) {
                             Tcl_InitHashTable(&reg->open_entries,
                                     sizeof(sqlite_int64)/sizeof(int));
@@ -215,7 +216,6 @@
                     default:
                         reg_sqlite_error(reg->db, errPtr, query);
                 }
-                sqlite3_reset(stmt);
             } while (r == SQLITE_BUSY);
         } else {
             reg_sqlite_error(reg->db, errPtr, query);
@@ -246,16 +246,17 @@
         reg_throw(errPtr,REG_MISUSE,"no database is attached to this registry");
         return 0;
     }
-    if (sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK) {
+    if (sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK) {
         int r;
         reg_entry* entry;
         Tcl_HashEntry* curr;
         Tcl_HashSearch search;
         /* XXX: Busy waiting, consider using sqlite3_busy_handler/timeout */
         do {
-            r = sqlite3_step(stmt);
+            sqlite3_step(stmt);
+            r = sqlite3_reset(stmt);
             switch (r) {
-                case SQLITE_DONE:
+                case SQLITE_OK:
                     for (curr = Tcl_FirstHashEntry(&reg->open_entries, &search);
                             curr != NULL; curr = Tcl_NextHashEntry(&search)) {
                         entry = Tcl_GetHashValue(curr);
@@ -274,7 +275,6 @@
                     reg_sqlite_error(reg->db, errPtr, query);
                     break;
             }
-            sqlite3_reset(stmt);
         } while (r == SQLITE_BUSY);
     } else {
         reg_sqlite_error(reg->db, errPtr, query);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100327/07511ccd/attachment-0001.html>