[svn] commit: r554 - in /experiments/graff-dpapi: Makefile sqlite3-test.cc

[BIND 10 source code commits]

Author: mgraff
Date: Wed Jan 27 00:59:26 2010
New Revision: 554

Log:
make compile on osx

Modified:
    experiments/graff-dpapi/Makefile
    experiments/graff-dpapi/sqlite3-test.cc

Modified: experiments/graff-dpapi/Makefile
==============================================================================
--- experiments/graff-dpapi/Makefile (original)
+++ experiments/graff-dpapi/Makefile Wed Jan 27 00:59:26 2010
@@ -1,5 +1,5 @@
-CFLAGS= -g -O -Wall
-LIBS=-lsqlite3 -ldb_cxx
+CFLAGS= -g -O -Wall -I/opt/local/include/db47
+LIBS=-lsqlite3 -L/opt/local/lib/db47 -ldb_cxx
 
 all: sqlite3-test dbm-test
 

Modified: experiments/graff-dpapi/sqlite3-test.cc
==============================================================================
--- experiments/graff-dpapi/sqlite3-test.cc (original)
+++ experiments/graff-dpapi/sqlite3-test.cc Wed Jan 27 00:59:26 2010
@@ -20,21 +20,6 @@
             exit(1);
         }
     }
-
-    static int
-    callback(void *NotUsed, int argc, char **argv, char **azColName)
-    {
-        NotUsed = 0;
-        int i;
-        for (i = 0 ; i < argc ; i++) {
-#if 0
-            std::cout << azColName[i] << " = "
-                << (argv[i] != NULL ? argv[i] : "NULL") << std::endl;
-#endif
-        }
-//        std::cout << std::endl;
-        return 0;
-    }
     
     int
     fetch_row(sqlite3_stmt *statement)
@@ -46,21 +31,21 @@
             str = sqlite3_column_text(statement, column);
             str_length = sqlite3_column_bytes(statement, column);
         }
+        return (columns);
     }
 
     int
     exe(sqlite3_stmt *statement)
     {
         int rc;
-        int ret;
 
         do {
             rc = sqlite3_step(statement);
             switch (rc) {
             case SQLITE_ROW:
-                ret = fetch_row(statement);
-                if (ret != SQLITE_OK)
-                    return ret;
+                rc = fetch_row(statement);
+                if (rc != SQLITE_OK)
+                    return rc;
                 break;
             case SQLITE_DONE:
                 return sqlite3_reset(statement);
@@ -69,6 +54,7 @@
                 return rc;
             }
         } while (rc == SQLITE_ROW);
+        return (rc);
     }
 
     ~SQLITE3() {
@@ -88,8 +74,8 @@
     SQLITE3 sql(argv[1]);
     
     sqlite3_stmt *prepared = NULL;
-    int ret = sqlite3_prepare_v2(sql.db, argv[2], strlen(argv[2]) + 1,
-                                 &prepared, NULL);
+    sqlite3_prepare_v2(sql.db, argv[2], strlen(argv[2]) + 1,
+                       &prepared, NULL);
     
     for (int counter = 0 ; counter < 1000000 ; counter++)
         sql.exe(prepared);