Specify type "void" in the parameter list of functions that take no parameters.

Tickets #3545 and #3546. (CVS 6046)

FossilOrigin-Name: c2228bd14ae54b17450f64357bf835d08c447250

diff --git a/manifest b/manifest
index 9d19c9f9105a7e6801bbdc8e89e4c67b97c60a3b..3b878613ae4db391fc162827f6487254098c4e7a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhanced\sanalysis\sof\sOR\sterms\sin\sa\sWHERE\sclause.\s\sAnother\sstep\stoward\sbeing\nable\sto\suse\sindices\swith\sOR-connected\sWHERE\sclause\sterms.\s(CVS\s6045)
-D 2008-12-20T02:06:14
+C Specify\stype\s"void"\sin\sthe\sparameter\slist\sof\sfunctions\sthat\stake\sno\sparameters.\nTickets\s#3545\sand\s#3546.\s(CVS\s6046)
+D 2008-12-20T02:14:40
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in f7e4c81c347b04f7b0f1c1b081a168645d7b8af7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -129,7 +129,7 @@ F src/mem1.c 3bfb39e4f60b0179713a7c087b2d4f0dc205735f
 F src/mem2.c 4c53c0071d3c68b8f252fe85d1667bad59421396
 F src/mem3.c 67153ec933e08b70714055e872efb58a6b287939
 F src/mem5.c 838309b521c96a2a34507f74a5a739d28de4aac6
-F src/memjournal.c e3c9aa679be8eecc4d5636f4d07aeeb084f41cf3
+F src/memjournal.c 17e9281ea5d7981e3e7b0dd3274921ecba4f773c
 F src/mutex.c e9cb5fbe94afb4328869afaf3ac49bd1327559eb
 F src/mutex.h 9e686e83a88838dac8b9c51271c651e833060f1e
 F src/mutex_noop.c f5a07671f25a1a9bd7c10ad7107bc2585446200f
@@ -158,7 +158,7 @@ F src/select.c a4316c5e8a417687e159b3d3ae689363d1dec5df
 F src/shell.c 65d19f8996a160f288087e31810f24025439c62a
 F src/sqlite.h.in 065a828e299960316aa34f05b9f0f10f33afe4c8
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
-F src/sqliteInt.h d7f8532c81038b1133d55c68f96afaf93ffb9138
+F src/sqliteInt.h dfe2dd15e55abbcd028d1582e01b599930bde631
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c 23db1e5f27c03160987c122a078b4bb51ef0b2f8
@@ -683,7 +683,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P e06a968aa5b17ce12ea179b36a99ad74d274fd2c
-R a6eb762ef1053032b1fe61a22a5c40ac
+P c3f7aa019c613e18457f090685725dd8a6a336b9
+R 16eef696dadb8073a93238b891b414de
 U drh
-Z a1e1b0e8f9ef51bafdd5164b7b2aaa33
+Z d9f46a7642ed6f6a261b7f5c413722a9

diff --git a/manifest.uuid b/manifest.uuid
index d473542c9ac14a9e0188f722a6a9e858638c9b81..41b91e0fb44b865da3c7414223a5353e1abafc66 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c3f7aa019c613e18457f090685725dd8a6a336b9
\ No newline at end of file
+c2228bd14ae54b17450f64357bf835d08c447250
\ No newline at end of file

diff --git a/src/memjournal.c b/src/memjournal.c
index d588e8ec84471cbdf81f6f8171334f4630386695..945b5da503f6f02c0e38ad7c2e6328d9017d5e9d 100644 (file)
--- a/src/memjournal.c
+++ b/src/memjournal.c
@@ -14,7 +14,7 @@
 ** The in-memory rollback journal is used to journal transactions for
 ** ":memory:" databases and when the journal_mode=MEMORY pragma is used.
 **
-** @(#) $Id: memjournal.c,v 1.7 2008/12/10 21:19:57 drh Exp $
+** @(#) $Id: memjournal.c,v 1.8 2008/12/20 02:14:40 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -240,6 +240,6 @@ int sqlite3IsMemJournal(sqlite3_file *pJfd){
 ** Return the number of bytes required to store a MemJournal that uses vfs
 ** pVfs to create the underlying on-disk files.
 */
-int sqlite3MemJournalSize(){
+int sqlite3MemJournalSize(void){
   return sizeof(MemJournal);
 }

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 0fab2f5129318f7f76e963a8db0e5e6f0a76e53e..26b6516999a48a99b02cca6c943bf6e5ad999b6b 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.811 2008/12/17 19:22:16 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.812 2008/12/20 02:14:40 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -2572,7 +2572,7 @@ int sqlite3FindInIndex(Parse *, Expr *, int*);
 #endif
 
 void sqlite3MemJournalOpen(sqlite3_file *);
-int sqlite3MemJournalSize();
+int sqlite3MemJournalSize(void);
 int sqlite3IsMemJournal(sqlite3_file *);
 
 #if SQLITE_MAX_EXPR_DEPTH>0