From 15abd02897a0f85431fb8a4e92c54d7a9e935ce9 Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 8 Apr 2006 19:14:53 +0000 Subject: [PATCH] Variable declarations should come before code. Ticket #1763. (CVS 3171) FossilOrigin-Name: 9682f84401f7e21630246e1c37351425b78b7afa --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/util.c | 5 +++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 9dd71cc8e4..d2e3598c19 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Reorder\scode\sso\sthat\sit\scompiles\swith\sSQLITE_OMIT_MEMORYDB.\s\sTicket\s#1754.\s(CVS\s3170) -D 2006-04-07T13:54:47 +C Variable\sdeclarations\sshould\scome\sbefore\scode.\s\sTicket\s#1763.\s(CVS\s3171) +D 2006-04-08T19:14:53 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -87,7 +87,7 @@ F src/tokenize.c 91dc520980c0e2fb9265046adf8b7a86eff881dd F src/trigger.c 48bbb94c11954c8e132efcc04478efe8304c4196 F src/update.c 34add66fcd3301b33b6e4c4c813f4e408f7ee4a0 F src/utf.c 1d51225bce1ea8d1978e8ab28e862a0c12c7a8e8 -F src/util.c 137e6765825863593095cbbeab0e9e4ba1cf575d +F src/util.c ca6ee72772c0f5dc04d2e0ab1973fd3b6a9bf79d F src/vacuum.c 5b37d0f436f8e1ffacd17934e44720b38d2247f9 F src/vdbe.c a56ef5de6d91aedf6f1f0db03c65aa01ecbe11ba F src/vdbe.h 44ff995a8b4e87016794095273e9e7300f0001bb @@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P e64809f0ae98ce9d152cf030cae72bf3df3e2403 -R 4f389ce5b05094a6ce92673da3fd0dc1 +P 1929e37d5e691f9d2bec01deb7bdbbbb6f5ace01 +R 6e7b54ed83595e6937776e7115544edc U drh -Z e53dff01699d01b873dcbd1273c67527 +Z 44bb100707342686e2ecd726d621c6c1 diff --git a/manifest.uuid b/manifest.uuid index bc28a195bb..c75a5c8bc3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1929e37d5e691f9d2bec01deb7bdbbbb6f5ace01 \ No newline at end of file +9682f84401f7e21630246e1c37351425b78b7afa \ No newline at end of file diff --git a/src/util.c b/src/util.c index 72751dfdf9..fb13b8297c 100644 --- a/src/util.c +++ b/src/util.c @@ -14,7 +14,7 @@ ** This file contains functions for allocating memory, comparing ** strings, and stuff like that. ** -** $Id: util.c,v 1.188 2006/04/04 01:54:55 drh Exp $ +** $Id: util.c,v 1.189 2006/04/08 19:14:53 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -476,8 +476,9 @@ static int OSSIZEOF(void *p){ ** pointer to the space allocated for the application to use. */ static void OSFREE(void *pFree){ + u32 *p; /* Pointer to the OS-layer allocation */ sqlite3OsEnterMutex(); - u32 *p = (u32 *)getOsPointer(pFree); /* p points to Os level allocation */ + p = (u32 *)getOsPointer(pFree); checkGuards(p); unlinkAlloc(p); memset(pFree, 0x55, OSSIZEOF(pFree)); -- 2.47.2