Fossil SCM

Fix some compiler warnings.

drh 2009-01-24 10:44 trunk
Commit cd965de68208d3314fa31b24441f475abd3d4216
Parent 83ac468aae28ad6…
5 files changed +1 -1 +2 +1 -1 +2 -2 +2 -2
~ src/cgi.c ~ src/report.c ~ src/rss.c ~ src/th.c ~ src/th_lang.c
M src/cgi.c
+1 -1
--- src/cgi.c
+++ src/cgi.c
@@ -1187,11 +1187,11 @@
11871187
 int cgi_http_server(int mnPort, int mxPort, char *zBrowser){
11881188
 #ifdef __MINGW32__
11891189
 /* Use win32_http_server() instead */
11901190
 exit(1);
11911191
 #else
1192
- int listener; /* The server socket */
1192
+ int listener = -1; /* The server socket */
11931193
 int connection; /* A socket for each individual connection */
11941194
 fd_set readfds; /* Set of file descriptors for select() */
11951195
 size_t lenaddr; /* Length of the inaddr structure */
11961196
 int child; /* PID of the child process */
11971197
 int nchildren = 0; /* Number of child processes */
11981198
--- src/cgi.c
+++ src/cgi.c
@@ -1187,11 +1187,11 @@
1187 int cgi_http_server(int mnPort, int mxPort, char *zBrowser){
1188 #ifdef __MINGW32__
1189 /* Use win32_http_server() instead */
1190 exit(1);
1191 #else
1192 int listener; /* The server socket */
1193 int connection; /* A socket for each individual connection */
1194 fd_set readfds; /* Set of file descriptors for select() */
1195 size_t lenaddr; /* Length of the inaddr structure */
1196 int child; /* PID of the child process */
1197 int nchildren = 0; /* Number of child processes */
1198
--- src/cgi.c
+++ src/cgi.c
@@ -1187,11 +1187,11 @@
1187 int cgi_http_server(int mnPort, int mxPort, char *zBrowser){
1188 #ifdef __MINGW32__
1189 /* Use win32_http_server() instead */
1190 exit(1);
1191 #else
1192 int listener = -1; /* The server socket */
1193 int connection; /* A socket for each individual connection */
1194 fd_set readfds; /* Set of file descriptors for select() */
1195 size_t lenaddr; /* Length of the inaddr structure */
1196 int child; /* PID of the child process */
1197 int nchildren = 0; /* Number of child processes */
1198
M src/report.c
+2
--- src/report.c
+++ src/report.c
@@ -615,10 +615,11 @@
615615
 @ FROM ticket
616616
 @ </pre></blockquote>
617617
 @
618618
 }
619619
620
+#if 0 /* NOT USED */
620621
 static void column_header(int rn,const char *zCol, int nCol, int nSorted,
621622
 const char *zDirection, const char *zExtra
622623
 ){
623624
 int set = (nCol==nSorted);
624625
 int desc = !strcmp(zDirection,"DESC");
@@ -641,10 +642,11 @@
641642
 @ href="rptview?rn=%d(rn)&amp;order_by=%d(nCol)&amp;\
642643
 @ order_dir=%s(desc?"ASC":"DESC")\
643644
 @ %s(zExtra)">%h(zCol)</a></th>
644645
 }
645646
 }
647
+#endif
646648
647649
 /*
648650
 ** The state of the report generation.
649651
 */
650652
 struct GenerateHTML {
651653
--- src/report.c
+++ src/report.c
@@ -615,10 +615,11 @@
615 @ FROM ticket
616 @ </pre></blockquote>
617 @
618 }
619
 
620 static void column_header(int rn,const char *zCol, int nCol, int nSorted,
621 const char *zDirection, const char *zExtra
622 ){
623 int set = (nCol==nSorted);
624 int desc = !strcmp(zDirection,"DESC");
@@ -641,10 +642,11 @@
641 @ href="rptview?rn=%d(rn)&amp;order_by=%d(nCol)&amp;\
642 @ order_dir=%s(desc?"ASC":"DESC")\
643 @ %s(zExtra)">%h(zCol)</a></th>
644 }
645 }
 
646
647 /*
648 ** The state of the report generation.
649 */
650 struct GenerateHTML {
651
--- src/report.c
+++ src/report.c
@@ -615,10 +615,11 @@
615 @ FROM ticket
616 @ </pre></blockquote>
617 @
618 }
619
620 #if 0 /* NOT USED */
621 static void column_header(int rn,const char *zCol, int nCol, int nSorted,
622 const char *zDirection, const char *zExtra
623 ){
624 int set = (nCol==nSorted);
625 int desc = !strcmp(zDirection,"DESC");
@@ -641,10 +642,11 @@
642 @ href="rptview?rn=%d(rn)&amp;order_by=%d(nCol)&amp;\
643 @ order_dir=%s(desc?"ASC":"DESC")\
644 @ %s(zExtra)">%h(zCol)</a></th>
645 }
646 }
647 #endif
648
649 /*
650 ** The state of the report generation.
651 */
652 struct GenerateHTML {
653
M src/rss.c
+1 -1
--- src/rss.c
+++ src/rss.c
@@ -49,11 +49,10 @@
4949
 Stmt q;
5050
 int nLine=0;
5151
 char *zPubDate, *zProjectName, *zProjectDescr, *zFreeProjectName=0;
5252
 Blob bSQL;
5353
 const char *zType = PD("y","all"); /* Type of events. All if NULL */
54
- blob_zero(&bSQL);
5554
 const char zSQL1[] =
5655
 @ SELECT
5756
 @ blob.rid,
5857
 @ uuid,
5958
 @ datetime(event.mtime),
@@ -62,10 +61,11 @@
6261
 @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim),
6362
 @ (SELECT count(*) FROM plink WHERE cid=blob.rid)
6463
 @ FROM event, blob
6564
 @ WHERE blob.rid=event.objid
6665
 ;
66
+ blob_zero(&bSQL);
6767
 blob_append( &bSQL, zSQL1, -1 );
6868
6969
 if( zType[0]!='a' ){
7070
 blob_appendf(&bSQL, " AND event.type=%Q", zType);
7171
 }
7272
--- src/rss.c
+++ src/rss.c
@@ -49,11 +49,10 @@
49 Stmt q;
50 int nLine=0;
51 char *zPubDate, *zProjectName, *zProjectDescr, *zFreeProjectName=0;
52 Blob bSQL;
53 const char *zType = PD("y","all"); /* Type of events. All if NULL */
54 blob_zero(&bSQL);
55 const char zSQL1[] =
56 @ SELECT
57 @ blob.rid,
58 @ uuid,
59 @ datetime(event.mtime),
@@ -62,10 +61,11 @@
62 @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim),
63 @ (SELECT count(*) FROM plink WHERE cid=blob.rid)
64 @ FROM event, blob
65 @ WHERE blob.rid=event.objid
66 ;
 
67 blob_append( &bSQL, zSQL1, -1 );
68
69 if( zType[0]!='a' ){
70 blob_appendf(&bSQL, " AND event.type=%Q", zType);
71 }
72
--- src/rss.c
+++ src/rss.c
@@ -49,11 +49,10 @@
49 Stmt q;
50 int nLine=0;
51 char *zPubDate, *zProjectName, *zProjectDescr, *zFreeProjectName=0;
52 Blob bSQL;
53 const char *zType = PD("y","all"); /* Type of events. All if NULL */
 
54 const char zSQL1[] =
55 @ SELECT
56 @ blob.rid,
57 @ uuid,
58 @ datetime(event.mtime),
@@ -62,10 +61,11 @@
61 @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim),
62 @ (SELECT count(*) FROM plink WHERE cid=blob.rid)
63 @ FROM event, blob
64 @ WHERE blob.rid=event.objid
65 ;
66 blob_zero(&bSQL);
67 blob_append( &bSQL, zSQL1, -1 );
68
69 if( zType[0]!='a' ){
70 blob_appendf(&bSQL, " AND event.type=%Q", zType);
71 }
72
M src/th.c
+2 -2
--- src/th.c
+++ src/th.c
@@ -1814,11 +1814,11 @@
18141814
18151815
 if( pExpr->pOp==0 ){
18161816
 /* A literal */
18171817
 rc = thSubstWord(interp, pExpr->zValue, pExpr->nValue);
18181818
 }else{
1819
- int eArgType; /* Actual type of arguments */
1819
+ int eArgType = 0; /* Actual type of arguments */
18201820
18211821
 /* Argument values */
18221822
 int iLeft;
18231823
 int iRight;
18241824
 double fLeft;
@@ -1864,11 +1864,11 @@
18641864
 }
18651865
 }
18661866
 }
18671867
18681868
 if( rc==TH_OK && eArgType==ARG_INTEGER ){
1869
- int iRes;
1869
+ int iRes = 0;
18701870
 switch( pExpr->pOp->eOp ) {
18711871
 case OP_MULTIPLY: iRes = iLeft*iRight; break;
18721872
 case OP_DIVIDE: iRes = iLeft/iRight; break;
18731873
 case OP_MODULUS: iRes = iLeft%iRight; break;
18741874
 case OP_ADD: iRes = iLeft+iRight; break;
18751875
--- src/th.c
+++ src/th.c
@@ -1814,11 +1814,11 @@
1814
1815 if( pExpr->pOp==0 ){
1816 /* A literal */
1817 rc = thSubstWord(interp, pExpr->zValue, pExpr->nValue);
1818 }else{
1819 int eArgType; /* Actual type of arguments */
1820
1821 /* Argument values */
1822 int iLeft;
1823 int iRight;
1824 double fLeft;
@@ -1864,11 +1864,11 @@
1864 }
1865 }
1866 }
1867
1868 if( rc==TH_OK && eArgType==ARG_INTEGER ){
1869 int iRes;
1870 switch( pExpr->pOp->eOp ) {
1871 case OP_MULTIPLY: iRes = iLeft*iRight; break;
1872 case OP_DIVIDE: iRes = iLeft/iRight; break;
1873 case OP_MODULUS: iRes = iLeft%iRight; break;
1874 case OP_ADD: iRes = iLeft+iRight; break;
1875
--- src/th.c
+++ src/th.c
@@ -1814,11 +1814,11 @@
1814
1815 if( pExpr->pOp==0 ){
1816 /* A literal */
1817 rc = thSubstWord(interp, pExpr->zValue, pExpr->nValue);
1818 }else{
1819 int eArgType = 0; /* Actual type of arguments */
1820
1821 /* Argument values */
1822 int iLeft;
1823 int iRight;
1824 double fLeft;
@@ -1864,11 +1864,11 @@
1864 }
1865 }
1866 }
1867
1868 if( rc==TH_OK && eArgType==ARG_INTEGER ){
1869 int iRes = 0;
1870 switch( pExpr->pOp->eOp ) {
1871 case OP_MULTIPLY: iRes = iLeft*iRight; break;
1872 case OP_DIVIDE: iRes = iLeft/iRight; break;
1873 case OP_MODULUS: iRes = iLeft%iRight; break;
1874 case OP_ADD: iRes = iLeft+iRight; break;
1875
M src/th_lang.c
+2 -2
--- src/th_lang.c
+++ src/th_lang.c
@@ -651,11 +651,11 @@
651651
 const char *zNeedle;
652652
 int nNeedle;
653653
 const char *zHaystack;
654654
 int nHaystack;
655655
 int i;
656
- int iRes;
656
+ int iRes = -1;
657657
658658
 if( argc!=4 ){
659659
 return Th_WrongNumArgs(interp, "string first needle haystack");
660660
 }
661661
@@ -712,11 +712,11 @@
712712
 const char *zNeedle;
713713
 int nNeedle;
714714
 const char *zHaystack;
715715
 int nHaystack;
716716
 int i;
717
- int iRes;
717
+ int iRes = -1;
718718
719719
 if( argc!=4 ){
720720
 return Th_WrongNumArgs(interp, "string first needle haystack");
721721
 }
722722
723723
--- src/th_lang.c
+++ src/th_lang.c
@@ -651,11 +651,11 @@
651 const char *zNeedle;
652 int nNeedle;
653 const char *zHaystack;
654 int nHaystack;
655 int i;
656 int iRes;
657
658 if( argc!=4 ){
659 return Th_WrongNumArgs(interp, "string first needle haystack");
660 }
661
@@ -712,11 +712,11 @@
712 const char *zNeedle;
713 int nNeedle;
714 const char *zHaystack;
715 int nHaystack;
716 int i;
717 int iRes;
718
719 if( argc!=4 ){
720 return Th_WrongNumArgs(interp, "string first needle haystack");
721 }
722
723
--- src/th_lang.c
+++ src/th_lang.c
@@ -651,11 +651,11 @@
651 const char *zNeedle;
652 int nNeedle;
653 const char *zHaystack;
654 int nHaystack;
655 int i;
656 int iRes = -1;
657
658 if( argc!=4 ){
659 return Th_WrongNumArgs(interp, "string first needle haystack");
660 }
661
@@ -712,11 +712,11 @@
712 const char *zNeedle;
713 int nNeedle;
714 const char *zHaystack;
715 int nHaystack;
716 int i;
717 int iRes = -1;
718
719 if( argc!=4 ){
720 return Th_WrongNumArgs(interp, "string first needle haystack");
721 }
722
723

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button