[asterisk-commits] twilson: branch twilson/sqlite_astdb r323929 - /team/twilson/sqlite_astdb/main/

[SVN commits to the Asterisk project]

Author: twilson
Date: Thu Jun 16 00:00:18 2011
New Revision: 323929

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=323929
Log:
Doc/spelling fix

Modified:
    team/twilson/sqlite_astdb/main/db.c

Modified: team/twilson/sqlite_astdb/main/db.c
URL: http://svnview.digium.com/svn/asterisk/team/twilson/sqlite_astdb/main/db.c?view=diff&rev=323929&r1=323928&r2=323929
==============================================================================
--- team/twilson/sqlite_astdb/main/db.c (original)
+++ team/twilson/sqlite_astdb/main/db.c Thu Jun 16 00:00:18 2011
@@ -203,7 +203,7 @@
 			ast_log(LOG_ERROR, "*** was not selected for build. To convert the\n");
 			ast_log(LOG_ERROR, "*** old astdb, please delete '%s'\n", dbname);
 			ast_log(LOG_ERROR, "*** and re-run 'make menuselect' and select astdb2sqlite3\n");
-			ast_log(LOG_ERROR, "*** in the Utilities section, them 'make && make install'.\n");
+			ast_log(LOG_ERROR, "*** in the Utilities section, then 'make && make install'.\n");
 			sleep(5);
 		} else {
 			ast_log(LOG_NOTICE, "Database conversion succeeded!\n");
@@ -235,10 +235,9 @@
 	return 0;
 }
 
-/* This is currently only useful for operations that don't
- * return rows and that shouldn't affect syncing--i.e. transaction calls.
- * We purposely don't lock around the sqlite3 call because the transaction
- * calls will be called with the database lock held. */
+/* We purposely don't lock around the sqlite3 call because the transaction
+ * calls will be called with the database lock held. For any other use, make
+ * sure to take the dblock yourself. */
 static int db_execute_sql(const char *sql, int (*callback)(void *, int, char **, char **), void *arg)
 {
 	char *errmsg = NULL;