[svn-commits] file: branch file/astdb-sqlite3 r78677 - /team/file/astdb-sqlite3/main/

[SVN commits to the Digium repositories]

Author: file
Date: Wed Aug  8 15:01:52 2007
New Revision: 78677

URL: http://svn.digium.com/view/asterisk?view=rev&rev=78677
Log:
Fixes for 64-bit platforms. lil' bit of casting in db.c and a minor Makefile change to ignore warnings.

Modified:
    team/file/astdb-sqlite3/main/Makefile
    team/file/astdb-sqlite3/main/db.c

Modified: team/file/astdb-sqlite3/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/file/astdb-sqlite3/main/Makefile?view=diff&rev=78677&r1=78676&r2=78677
==============================================================================
--- team/file/astdb-sqlite3/main/Makefile (original)
+++ team/file/astdb-sqlite3/main/Makefile Wed Aug  8 15:01:52 2007
@@ -120,6 +120,8 @@
 
 channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
 
+sqlite3.o: ASTCFLAGS="$(PTHREAD_CFLAGS)"
+
 AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS))
 AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED_LDFLAGS),$(value $(dep)))
 AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))

Modified: team/file/astdb-sqlite3/main/db.c
URL: http://svn.digium.com/view/asterisk/team/file/astdb-sqlite3/main/db.c?view=diff&rev=78677&r1=78676&r2=78677
==============================================================================
--- team/file/astdb-sqlite3/main/db.c (original)
+++ team/file/astdb-sqlite3/main/db.c Wed Aug  8 15:01:52 2007
@@ -200,7 +200,7 @@
 
 	/* Grab the result */
 	while ((res = sqlite3_step(stmt)) != SQLITE_DONE) {
-		ast_copy_string(value, sqlite3_column_text(stmt, 0), valuelen);
+		ast_copy_string(value, (char*)sqlite3_column_text(stmt, 0), valuelen);
 		res2 = 0;
 	}
 
@@ -501,9 +501,9 @@
 		struct ast_db_entry *cur = NULL;
 		if (!(cur = ast_calloc(1, sizeof(*cur))))
 			break;
-		cur->family = ast_strdup(sqlite3_column_text(stmt, 0));
-		cur->key = ast_strdup(sqlite3_column_text(stmt, 1));
-		cur->value = ast_strdup(sqlite3_column_text(stmt, 2));
+		cur->family = ast_strdup((char*)sqlite3_column_text(stmt, 0));
+		cur->key = ast_strdup((char*)sqlite3_column_text(stmt, 1));
+		cur->value = ast_strdup((char*)sqlite3_column_text(stmt, 2));
 		if (last)
 			AST_LIST_NEXT(last, list) = cur;
 		else