Fix some function declarations (change "int foo()" to "int foo(void)"). Ticket #3399...

FossilOrigin-Name: 0fb98c35353d8c0a8d669bbe45fe84e3a5060621

diff --git a/manifest b/manifest
index 0a94b260ff2c8ca8c9a348c269e95b352fa3255c..90be999ae979bc856ae74278bc907e01573542fa 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Catch\sanother\scase\swhere\sSQLITE_IOERR\scould\sbe\sreturned\sinstead\sof\sSQLITE_NOMEM\sfollowing\san\sout-of-memory\serror.\s(CVS\s5739)
-D 2008-09-23T17:39:26
+C Fix\ssome\sfunction\sdeclarations\s(change\s"int\sfoo()"\sto\s"int\sfoo(void)").\sTicket\s#3399.\s(CVS\s5740)
+D 2008-09-24T09:12:47
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in e4ab842f9a64ef61d57093539a8aab76b12810db
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -135,12 +135,12 @@ F src/os.c 74ac327e8f82f53c9461466f46f736ac5d05b97e
 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c e391fc95adc744bbdcefd4d11e3066998185a0a0
-F src/os_unix.c ee778087d7b73746598947a93d2e1de3f909c9c2
+F src/os_unix.c f33b69d8a85372b270fe37ee664a4c2140a5217d
 F src/os_win.c 3209dc0ed734291764393ea8d534ba0d8696a540
 F src/pager.c 7a3ba14e27cf134e54f0f4f58d307de13a7ea28d
 F src/pager.h 1ef5a3f8e0b4c8b30f19c8e01d4fca2db9bb5797
 F src/parse.y d0f76d2cb8d6883d5600dc20beb961a6022b94b8
-F src/pcache.c e2a4dd0ae4118c95499b97806ea26ece8d12127a
+F src/pcache.c 52108517c38bcf023f3977085a66aacb520a5385
 F src/pcache.h 0b6871e820159629915e8688b5c67a81a203773f
 F src/pragma.c e633b6b7dabc110e2abfed4e35ba34a4039cb65c
 F src/prepare.c c7e00ed1b0bdcf699b1aad651247d4dc3d281b0b
@@ -402,7 +402,7 @@ F test/lock.test 6825aea0b5885578b1b63a3b178803842c4ee9f1
 F test/lock2.test 018b846f6f3b3b695fad07e317b7988442b556f4
 F test/lock3.test 615111293cf32aa2ed16d01c6611737651c96fb9
 F test/lock4.test 09d97d52cae18fadfe631552af9880dac6b3ae90
-F test/lock5.test f4eeb0400cf65c37f733cb3c74401136f8c46acd
+F test/lock5.test 904c20aec51d5dbff0a3aec6a4d35c5ae0257449
 F test/lookaside.test 8866ea41301d74993423c99e523322fca09c259e
 F test/main.test 187a9a1b5248ed74a83838c581c15ec6023b555b
 F test/malloc.test 6ff6063f750d30741bc6d8c01b6ae5f94f5cf6f6
@@ -637,7 +637,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 046ef07261d520c9399bd8cdfdfd5281956b7a27
-R dfc4e12505acec1a0c448720b1492aee
+P 18d030da0c1755aab458e5aa0d3ad0a714706d67
+R 11535e9b9e86d8fb3a874ab506c449b0
 U danielk1977
-Z 5af64882fb58e650b1db6cb44449fe90
+Z ee91073a9a545206f9656a2661645181

diff --git a/manifest.uuid b/manifest.uuid
index 332b74515167994496761665beb1640187ea33b3..259affe3016bdd2dfa3930eb5f161e67a0a5f07c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-18d030da0c1755aab458e5aa0d3ad0a714706d67
\ No newline at end of file
+0fb98c35353d8c0a8d669bbe45fe84e3a5060621
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index d9272eef97352f6f75584dfe7466badd5ddc358c..140fdbd57953980ad89389059ea6d6c8f9f0841f 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to Unix systems.
 **
-** $Id: os_unix.c,v 1.203 2008/09/23 10:23:26 drh Exp $
+** $Id: os_unix.c,v 1.204 2008/09/24 09:12:47 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #if SQLITE_OS_UNIX              /* This file is used on unix only */
@@ -389,10 +389,10 @@ static struct openCnt *openList = 0;
 /*
 ** Helper functions to obtain and relinquish the global mutex.
 */
-static void enterMutex(){
+static void enterMutex(void){
   sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
 }
-static void leaveMutex(){
+static void leaveMutex(void){
   sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
 }
 

diff --git a/src/pcache.c b/src/pcache.c
index f8f6dcf009231d5349eb08186c1752904d748861..d0dbb41c2e64c9ff416a1cf21e4fe0af03fe84fb 100644 (file)
--- a/src/pcache.c
+++ b/src/pcache.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file implements that page cache.
 **
-** @(#) $Id: pcache.c,v 1.31 2008/09/21 15:14:04 drh Exp $
+** @(#) $Id: pcache.c,v 1.32 2008/09/24 09:12:47 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -523,7 +523,7 @@ static int pcachePageSize(PgHdr *p){
 ** A pointer to the recycled page is returned, or NULL if no page is
 ** eligible for recycling.
 */
-static PgHdr *pcacheRecyclePage(){
+static PgHdr *pcacheRecyclePage(void){
   PgHdr *p = 0;
   assert( sqlite3_mutex_held(pcache_g.mutex) );
 
@@ -951,7 +951,7 @@ void sqlite3PcacheTruncate(PCache *pCache, Pgno pgno){
 ** If there are currently more than pcache.nMaxPage pages allocated, try
 ** to recycle pages to reduce the number allocated to pcache.nMaxPage.
 */
-static void pcacheEnforceMaxPage(){
+static void pcacheEnforceMaxPage(void){
   PgHdr *p;
   assert( sqlite3_mutex_held(pcache_g.mutex) );
   while( pcache_g.nCurrentPage>pcache_g.nMaxPage && (p = pcacheRecyclePage()) ){

diff --git a/test/lock5.test b/test/lock5.test
index b4187cafc64acbf5ac5001776bfa6c11eef66ff6..0f0b5d2f2a78a6c4380c6bf7e8f40f5d5e60fc70 100644 (file)
--- a/test/lock5.test
+++ b/test/lock5.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is database locks.
 #
-# $Id: lock5.test,v 1.2 2008/07/12 14:52:20 drh Exp $
+# $Id: lock5.test,v 1.3 2008/09/24 09:12:47 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -20,7 +20,6 @@ source $testdir/tester.tcl
 # SQLITE_ENABLE_LOCKING_STYLE macro.
 db close
 if {[catch {sqlite3 db test.db -vfs unix-none} msg]} {
-puts $msg
   finish_test
   return
 }