Remove a non-ansi construct from mem1.c - an assert() statement before the variable...

FossilOrigin-Name: 1de98da6b4c2039e5dc594cc9bfc7d49ae36697c

diff --git a/manifest b/manifest
index ef4f6e369076ff07cc4e4e9c54399a56dd3ec9e1..a24ff9f78e7ef488ee49f6cba6a58c51fff33027 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\spassing\s"void(*)(void)"\sas\san\sargument\sto\sva_arg().\sCodewarrior\sdoesn't\slike\sit.\s(CVS\s5279)
-D 2008-06-23T14:15:53
+C Remove\sa\snon-ansi\sconstruct\sfrom\smem1.c\s-\san\sassert()\sstatement\sbefore\sthe\svariable\sdeclarations\sin\sa\sfunction.\s(CVS\s5280)
+D 2008-06-23T14:40:18
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in ff6f90048555a0088f6a4b7406bed5e55a7c4eff
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -118,7 +118,7 @@ F src/loadext.c 40024a0f476c1279494876b9a002001b29e5d3e3
 F src/main.c c5a5b0d7826f9abeb16c75edfae72ec24594ce28
 F src/malloc.c f52166df8abd7ff6990dbee1a0ce3534addc8617
 F src/md5.c 008216bbb5d34c6fbab5357aa68575ad8a31516a
-F src/mem1.c 159f10e280f2d9aea597cf938851e61652dd5c3d
+F src/mem1.c 381aa498522b404e95d470670fc83702fa30025c
 F src/mem2.c 23f9538f35fbcd5665afe7056a56be0c7ed65aa7
 F src/mem3.c 28b4812b87470a00b11821fb5850e7cabcce06c6
 F src/mem4.c 6703adb1717b26d9d70a1c2586b4b7b7ffee7909
@@ -592,7 +592,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P e6ea8f87c102bd36ab0f2fbc8360fde49f4e3422
-R 6a41be28a329b52ada431d44cab92555
+P edae76d6ff5918007c0a802a34e65412f8f0ebb6
+R c13f4e2a5a84b597d7d8ead887a168f5
 U danielk1977
-Z e7c5c2712d4ab35f4842e972a84d4467
+Z 2e3925d1d8a7d85edad82d8d186950e7

diff --git a/manifest.uuid b/manifest.uuid
index e9c8cca664c11cc8be5d4f7c7b111cf2d68f764c..da7e205ba2f61d6202e776f2895c69720042104a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-edae76d6ff5918007c0a802a34e65412f8f0ebb6
\ No newline at end of file
+1de98da6b4c2039e5dc594cc9bfc7d49ae36697c
\ No newline at end of file

diff --git a/src/mem1.c b/src/mem1.c
index e423225389ba53905c7b996c6ade330e8ce1aecd..8cd71b875624d9f6aad848adf588c6126364ba48 100644 (file)
--- a/src/mem1.c
+++ b/src/mem1.c
@@ -17,7 +17,7 @@
 ** This file contains implementations of the low-level memory allocation
 ** routines specified in the sqlite3_mem_methods object.
 **
-** $Id: mem1.c,v 1.21 2008/06/17 15:12:01 drh Exp $
+** $Id: mem1.c,v 1.22 2008/06/23 14:40:18 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -54,8 +54,8 @@ static void *sqlite3MemMalloc(int nByte){
 ** by higher-level routines.
 */
 static void sqlite3MemFree(void *pPrior){
-  assert( pPrior!=0 );
   sqlite3_int64 *p = (sqlite3_int64*)pPrior;
+  assert( pPrior!=0 );
   p--;
   free(p);
 }