#! /bin/sh /usr/share/dpatch/dpatch-run ## clean-warnings.dpatch by Daniel Kahn Gillmor ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Clean up spurious compiler warnings in sqlite3_drv.c and during ## DP: autoconf to allow building with -Werror @DPATCH@ diff -urNad dspam-3.6.6~/m4/mysql_drv.m4 dspam-3.6.6/m4/mysql_drv.m4 --- dspam-3.6.6~/m4/mysql_drv.m4 2006-05-28 21:45:48.000000000 -0400 +++ dspam-3.6.6/m4/mysql_drv.m4 2006-05-28 21:45:57.390114192 -0400 @@ -158,6 +158,7 @@ ]], [[ MYSQL *mysql = mysql_init(NULL); + mysql_close(mysql); ]])], [ mysql_libs_success=yes ], [ mysql_libs_success=no ] diff -urNad dspam-3.6.6~/m4/pgsql_drv.m4 dspam-3.6.6/m4/pgsql_drv.m4 --- dspam-3.6.6~/m4/pgsql_drv.m4 2006-05-28 21:45:48.000000000 -0400 +++ dspam-3.6.6/m4/pgsql_drv.m4 2006-05-28 21:45:57.391114040 -0400 @@ -152,6 +152,7 @@ ]], [[ PGconn *pgsql = PQconnectdb(NULL); + PQfinish(pgsql); ]])], [ pgsql_libs_success=yes ], [ pgsql_libs_success=no ] diff -urNad dspam-3.6.6~/m4/sqlite3_drv.m4 dspam-3.6.6/m4/sqlite3_drv.m4 --- dspam-3.6.6~/m4/sqlite3_drv.m4 2006-05-28 21:45:48.000000000 -0400 +++ dspam-3.6.6/m4/sqlite3_drv.m4 2006-05-28 21:47:24.042940960 -0400 @@ -65,6 +65,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include + #include #ifdef HAVE_UNISTD_H # include #endif @@ -197,7 +198,8 @@ #include ]], [[ - const char *v = sqlite3_version; + const char *v = 0; + v = sqlite3_version; ]])], [ ds_sqlite_libs_success=yes ], [ ds_sqlite_libs_success=no ] diff -urNad dspam-3.6.6~/m4/sqlite_drv.m4 dspam-3.6.6/m4/sqlite_drv.m4 --- dspam-3.6.6~/m4/sqlite_drv.m4 2006-05-28 21:45:48.000000000 -0400 +++ dspam-3.6.6/m4/sqlite_drv.m4 2006-05-28 21:46:41.682380744 -0400 @@ -65,6 +65,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include + #include #ifdef HAVE_UNISTD_H # include #endif @@ -197,7 +198,8 @@ #include ]], [[ - const char *v = sqlite_version; + const char *v = 0; + v = sqlite_version; ]])], [ ds_sqlite_libs_success=yes ], [ ds_sqlite_libs_success=no ] diff -urNad dspam-3.6.6~/src/sqlite3_drv.c dspam-3.6.6/src/sqlite3_drv.c --- dspam-3.6.6~/src/sqlite3_drv.c 2006-05-28 21:45:57.036168000 -0400 +++ dspam-3.6.6/src/sqlite3_drv.c 2006-05-28 21:45:57.392113888 -0400 @@ -135,7 +135,7 @@ struct _sqlite_drv_storage *s = (struct _sqlite_drv_storage *) CTX->storage; char query[1024]; char *err=NULL; - int result; + int result = SQLITE_OK; if (s->dbh == NULL) {