Bug fix in vdbe.c - variable declarations must come before code in ANSI C. (CVS 1440)

FossilOrigin-Name: c36203de22f673691783529e06ce5a58bcebeedc
This commit is contained in:
drh 2004-05-22 11:09:30 +00:00
parent fe7fdb7344
commit 60ca804396
3 changed files with 10 additions and 10 deletions

View File

@ -1,5 +1,5 @@
C Add\sa\scouple\sof\stests\sfor\sUTF-16\sdatabases.\s(CVS\s1439) C Bug\sfix\sin\svdbe.c\s-\svariable\sdeclarations\smust\scome\sbefore\scode\sin\sANSI\sC.\s(CVS\s1440)
D 2004-05-22T10:33:04 D 2004-05-22T11:09:30
F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@ -64,7 +64,7 @@ F src/update.c 1a5e9182596f3ea8c7a141e308a3d2a7e5689fee
F src/utf.c 537e1c98cddc623628d44497ec02c2246cf66dea F src/utf.c 537e1c98cddc623628d44497ec02c2246cf66dea
F src/util.c 5cbeb452da09cfc7248de9948c15b14d840723f7 F src/util.c 5cbeb452da09cfc7248de9948c15b14d840723f7
F src/vacuum.c 8734f89742f246abd91dbd3e087fc153bddbfbad F src/vacuum.c 8734f89742f246abd91dbd3e087fc153bddbfbad
F src/vdbe.c a21826df111a46e772cb37b73a6b2726c5c93883 F src/vdbe.c c1846f4b2938d11250f532b068d7856fd8decd6c
F src/vdbe.h 391d5642a83af686f35c228fcd36cb4456d68f44 F src/vdbe.h 391d5642a83af686f35c228fcd36cb4456d68f44
F src/vdbeInt.h f40e8048d644c8389cda16f46479376f763d56e6 F src/vdbeInt.h f40e8048d644c8389cda16f46479376f763d56e6
F src/vdbeaux.c d3dfb6d40eb1fdf2626896e8b13fe7b50134ff12 F src/vdbeaux.c d3dfb6d40eb1fdf2626896e8b13fe7b50134ff12
@ -197,7 +197,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
P d7551df8c32c4981d94eb57cd2a999592e91f50f P 891be63a92097384e1b00993d35f002048c4b42e
R 6f88cc157d8cb8bd7f75314a4406aae5 R 543ddb60688125b3fffe05e3e9ef31d2
U danielk1977 U drh
Z 3cefbdbbe032525a12fc2e23d5eb2a99 Z 735268b125ff8e5769b42e78ffc4dd1e

View File

@ -1 +1 @@
891be63a92097384e1b00993d35f002048c4b42e c36203de22f673691783529e06ce5a58bcebeedc

View File

@ -43,7 +43,7 @@
** in this file for details. If in doubt, do not deviate from existing ** in this file for details. If in doubt, do not deviate from existing
** commenting and indentation practices when changing or adding code. ** commenting and indentation practices when changing or adding code.
** **
** $Id: vdbe.c,v 1.318 2004/05/22 10:33:04 danielk1977 Exp $ ** $Id: vdbe.c,v 1.319 2004/05/22 11:09:30 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include "os.h" #include "os.h"
@ -4712,9 +4712,9 @@ case OP_SortPut: {
case OP_Sort: { case OP_Sort: {
int i; int i;
KeyInfo *pKeyInfo = (KeyInfo*)pOp->p3; KeyInfo *pKeyInfo = (KeyInfo*)pOp->p3;
pKeyInfo->enc = p->db->enc;
Sorter *pElem; Sorter *pElem;
Sorter *apSorter[NSORT]; Sorter *apSorter[NSORT];
pKeyInfo->enc = p->db->enc;
for(i=0; i<NSORT; i++){ for(i=0; i<NSORT; i++){
apSorter[i] = 0; apSorter[i] = 0;
} }