From 3039c0a89639d3dcd4bb8d2a9839a6df089dbae7 Mon Sep 17 00:00:00 2001 From: drh Date: Sun, 29 Feb 2004 00:11:30 +0000 Subject: [PATCH] Fix some compiler warnings in LCC. The warnings did not indicate real problems. Ticket #634. Not all warnings in ticket #634 were fixed. (CVS 1276) FossilOrigin-Name: e97089b7df3e2fbfcf36062099d02ecb75e9a870 --- manifest | 18 +++++++++--------- manifest.uuid | 2 +- src/btree_rb.c | 25 +++++++++++-------------- src/os.c | 2 +- src/printf.c | 6 +++--- 5 files changed, 25 insertions(+), 28 deletions(-) diff --git a/manifest b/manifest index a40d91f2a6..3545b39310 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sWindows\s.dll\sbuild\suse\sthe\sreal\s.o\sfiles,\snot\sthe\slibtool-faked\s.lo\nones.\s(CVS\s1275) -D 2004-02-28T18:02:21 +C Fix\ssome\scompiler\swarnings\sin\sLCC.\s\sThe\swarnings\sdid\snot\sindicate\sreal\nproblems.\s\sTicket\s#634.\s\sNot\sall\swarnings\sin\sticket\s#634\swere\sfixed.\s(CVS\s1276) +D 2004-02-29T00:11:31 F Makefile.in afc6c0377773421633e592347097ad036eef6aeb F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -25,7 +25,7 @@ F src/attach.c b01db0d3211f673d8e670abf7eaad04591d40d14 F src/auth.c 4fa3b05bd19445d1c474d6751c4a508d6ea0abe1 F src/btree.c 0a40efb01fa3a431a16d8604f603431d8c9cebfa F src/btree.h 41cb3ff6ebc3f6da2d0a074e39ff8c7a2287469f -F src/btree_rb.c 32b2cb4285c0fbd53b89de021637b63d52257e54 +F src/btree_rb.c 99feb3ff835106d018a483a1ce403e5cf9c718bc F src/build.c c8ab8b467d9a64254b0d4d42083f6313b3a980d1 F src/copy.c 750e13828c3e4a293123e36aaa7cf0f22466248a F src/date.c 3025642cee50d5c41aef4a22cbc41aa7e543c922 @@ -38,13 +38,13 @@ F src/hash.h 3247573ab95b9dd90bcca0307a75d9a16da1ccc7 F src/insert.c c0485ee2d1b99322894e2d1e0b576fd05ed75616 F src/main.c 2956e9332241ff9e62c25f370d0615a9981e6d8f F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565 -F src/os.c f5fc4954725b2fcd852979f2746085fe8ca27710 +F src/os.c afcc304d13b0d28755984aa1636e66370210d3e3 F src/os.h 250a3789be609adfee5c5aa20137ce8683276f24 F src/pager.c b246986e5ba31b15aa3cf91d3b9ec2e608aceb8e F src/pager.h 82332878799280145639a48d88cdb4058925e3f6 F src/parse.y 023720cb8c3bef74e51738bca78335d0dc6d2cfd F src/pragma.c 621d319580e9e23712ec232e8be1786cdae06b36 -F src/printf.c f201a5a316afc474d29d51e07501536e8998194d +F src/printf.c 8c58b7b6d4069eec6ebe2d46bdbc3a89a367bf95 F src/random.c 775913e0b7fbd6295d21f12a7bd35b46387c44b2 F src/select.c a8b0f9bfe92001d2399d33832bd6ec57ba492ae7 F src/shell.c b19e750ffcccf49b626f4b6fefe89c1dbae47e82 @@ -188,7 +188,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P 22d63bbf78997f0b31bb39054fbcfccf9d974bd6 -R 4e0891d3395dee30e172c7803be3f1e5 -U a.rottmann -Z 9d5cc8cfa72fd925cf127d8f275e59f9 +P cce5bbf49b0a30c40d24a559bc6cb4585dd9aea5 +R c1ab69a50c059587ef6df03a47d3a546 +U drh +Z 589d89131597903f1402420d403727ec diff --git a/manifest.uuid b/manifest.uuid index 636e295621..013bc00528 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -cce5bbf49b0a30c40d24a559bc6cb4585dd9aea5 \ No newline at end of file +e97089b7df3e2fbfcf36062099d02ecb75e9a870 \ No newline at end of file diff --git a/src/btree_rb.c b/src/btree_rb.c index d57ddca726..ea4b3dda75 100644 --- a/src/btree_rb.c +++ b/src/btree_rb.c @@ -9,7 +9,7 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id: btree_rb.c,v 1.23 2004/02/12 15:31:21 drh Exp $ +** $Id: btree_rb.c,v 1.24 2004/02/29 00:11:31 drh Exp $ ** ** This file implements an in-core database using Red-Black balanced ** binary trees. @@ -259,17 +259,16 @@ static void rightRotate(BtRbTree *pTree, BtRbNode *pX) * concatenation of orig and val is returned. The original orig is deleted * (using sqliteFree()). */ -static char *append_val(char * orig, char const * val) -{ +static char *append_val(char * orig, char const * val){ + char *z; if( !orig ){ - return sqliteStrDup( val ); + z = sqliteStrDup( val ); } else{ - char * ret = 0; - sqliteSetString(&ret, orig, val, (char*)0); + z = 0; + sqliteSetString(&z, orig, val, (char*)0); sqliteFree( orig ); - return ret; } - assert(0); + return z; } /* @@ -1178,12 +1177,11 @@ static int memRbtreeKey(RbtCursor* pCur, int offset, int amt, char *zBuf) if( !pCur->pNode ) return 0; if( !pCur->pNode->pKey || ((amt + offset) <= pCur->pNode->nKey) ){ memcpy(zBuf, ((char*)pCur->pNode->pKey)+offset, amt); - return amt; }else{ memcpy(zBuf, ((char*)pCur->pNode->pKey)+offset, pCur->pNode->nKey-offset); - return pCur->pNode->nKey-offset; + amt = pCur->pNode->nKey-offset; } - assert(0); + return amt; } static int memRbtreeDataSize(RbtCursor* pCur, int *pSize) @@ -1201,12 +1199,11 @@ static int memRbtreeData(RbtCursor *pCur, int offset, int amt, char *zBuf) if( !pCur->pNode ) return 0; if( (amt + offset) <= pCur->pNode->nData ){ memcpy(zBuf, ((char*)pCur->pNode->pData)+offset, amt); - return amt; }else{ memcpy(zBuf, ((char*)pCur->pNode->pData)+offset ,pCur->pNode->nData-offset); - return pCur->pNode->nData-offset; + amt = pCur->pNode->nData-offset; } - assert(0); + return amt; } static int memRbtreeCloseCursor(RbtCursor* pCur) diff --git a/src/os.c b/src/os.c index fb987f3ca1..b4ae7a107d 100644 --- a/src/os.c +++ b/src/os.c @@ -1214,7 +1214,7 @@ int sqliteOsFileSize(OsFile *id, off_t *pSize){ ** the LockFileEx() API. */ int isNT(void){ - static osType = 0; /* 0=unknown 1=win95 2=winNT */ + static int osType = 0; /* 0=unknown 1=win95 2=winNT */ if( osType==0 ){ OSVERSIONINFO sInfo; sInfo.dwOSVersionInfoSize = sizeof(sInfo); diff --git a/src/printf.c b/src/printf.c index 3cd7942802..620578d76e 100644 --- a/src/printf.c +++ b/src/printf.c @@ -358,7 +358,7 @@ static int vxprintf( if( flag_zeropad && precision0 ); } - length = &buf[etBUFSIZE]-bufpt; + length = &buf[etBUFSIZE-1]-bufpt; for(idx=precision-length; idx>0; idx--){ *(--bufpt) = '0'; /* Zero pad */ } @@ -381,7 +381,7 @@ static int vxprintf( for(pre=infop->prefix; (x=(*pre))!=0; pre++) *(--bufpt) = x; } } - length = &buf[etBUFSIZE]-bufpt; + length = &buf[etBUFSIZE-1]-bufpt; break; case etFLOAT: case etEXP: -- 2.47.2