Fossil SCM

Clean up some harmless compiler warnings.

drh 2012-11-02 02:41 trunk
Commit 0a4193be588ae3a2d3288e62d861e3b55e2f29a0
Parent ba418ee1ce46d43…
5 files changed -1 -1 +3 -3 -2 -5
~ src/attach.c ~ src/info.c ~ src/setup.c ~ src/tkt.c ~ src/wiki.c
M src/attach.c
-1
--- src/attach.c
+++ src/attach.c
@@ -358,11 +358,10 @@
358358
 int modPending; /* True if awaiting moderation */
359359
 const char *zModAction; /* Moderation action or NULL */
360360
 int isModerator; /* TRUE if user is the moderator */
361361
 const char *zMime; /* MIME Type */
362362
 Blob attach; /* Content of the attachment */
363
- int wantToDelete = P("del")!=0;/* Want to delete */
364363
365364
 login_check_credentials();
366365
 if( !g.perm.RdTkt && !g.perm.RdWiki ){ login_needed(); return; }
367366
 rid = name_to_rid_www("name");
368367
 if( rid==0 ){ fossil_redirect_home(); }
369368
--- src/attach.c
+++ src/attach.c
@@ -358,11 +358,10 @@
358 int modPending; /* True if awaiting moderation */
359 const char *zModAction; /* Moderation action or NULL */
360 int isModerator; /* TRUE if user is the moderator */
361 const char *zMime; /* MIME Type */
362 Blob attach; /* Content of the attachment */
363 int wantToDelete = P("del")!=0;/* Want to delete */
364
365 login_check_credentials();
366 if( !g.perm.RdTkt && !g.perm.RdWiki ){ login_needed(); return; }
367 rid = name_to_rid_www("name");
368 if( rid==0 ){ fossil_redirect_home(); }
369
--- src/attach.c
+++ src/attach.c
@@ -358,11 +358,10 @@
358 int modPending; /* True if awaiting moderation */
359 const char *zModAction; /* Moderation action or NULL */
360 int isModerator; /* TRUE if user is the moderator */
361 const char *zMime; /* MIME Type */
362 Blob attach; /* Content of the attachment */
 
363
364 login_check_credentials();
365 if( !g.perm.RdTkt && !g.perm.RdWiki ){ login_needed(); return; }
366 rid = name_to_rid_www("name");
367 if( rid==0 ){ fossil_redirect_home(); }
368
M src/info.c
-1
--- src/info.c
+++ src/info.c
@@ -1566,11 +1566,10 @@
15661566
 int renderAsWiki = 0;
15671567
 int renderAsHtml = 0;
15681568
 int objType;
15691569
 int asText;
15701570
 const char *zUuid;
1571
- Manifest *pManifest;
15721571
15731572
 if( P("ci") && P("filename") ){
15741573
 rid = artifact_from_ci_and_filename();
15751574
 }
15761575
 if( rid==0 ){
15771576
--- src/info.c
+++ src/info.c
@@ -1566,11 +1566,10 @@
1566 int renderAsWiki = 0;
1567 int renderAsHtml = 0;
1568 int objType;
1569 int asText;
1570 const char *zUuid;
1571 Manifest *pManifest;
1572
1573 if( P("ci") && P("filename") ){
1574 rid = artifact_from_ci_and_filename();
1575 }
1576 if( rid==0 ){
1577
--- src/info.c
+++ src/info.c
@@ -1566,11 +1566,10 @@
1566 int renderAsWiki = 0;
1567 int renderAsHtml = 0;
1568 int objType;
1569 int asText;
1570 const char *zUuid;
 
1571
1572 if( P("ci") && P("filename") ){
1573 rid = artifact_from_ci_and_filename();
1574 }
1575 if( rid==0 ){
1576
M src/setup.c
+3 -3
--- src/setup.c
+++ src/setup.c
@@ -342,12 +342,12 @@
342342
 char zCap[50], zNm[4];
343343
 zNm[0] = 'a';
344344
 zNm[2] = 0;
345345
 for(i=0, c='a'; c<='z'; c++){
346346
 zNm[1] = c;
347
- a[c] = (c!='s' || g.perm.Setup) && P(zNm)!=0;
348
- if( a[c] ) zCap[i++] = c;
347
+ a[c&0x7f] = (c!='s' || g.perm.Setup) && P(zNm)!=0;
348
+ if( a[c&0x7f] ) zCap[i++] = c;
349349
 }
350350
351351
 zCap[i] = 0;
352352
 zPw = P("pw");
353353
 zLogin = P("login");
@@ -432,11 +432,11 @@
432432
 zInfo = db_text("", "SELECT info FROM user WHERE uid=%d", uid);
433433
 zCap = db_text("", "SELECT cap FROM user WHERE uid=%d", uid);
434434
 zPw = db_text("", "SELECT pw FROM user WHERE uid=%d", uid);
435435
 for(i=0; zCap[i]; i++){
436436
 char c = zCap[i];
437
- if( c>='a' && c<='z' ) oa[c] = " checked=\"checked\"";
437
+ if( c>='a' && c<='z' ) oa[c&0x7f] = " checked=\"checked\"";
438438
 }
439439
 }
440440
441441
 /* figure out inherited permissions */
442442
 memset(inherit, 0, sizeof(inherit));
443443
--- src/setup.c
+++ src/setup.c
@@ -342,12 +342,12 @@
342 char zCap[50], zNm[4];
343 zNm[0] = 'a';
344 zNm[2] = 0;
345 for(i=0, c='a'; c<='z'; c++){
346 zNm[1] = c;
347 a[c] = (c!='s' || g.perm.Setup) && P(zNm)!=0;
348 if( a[c] ) zCap[i++] = c;
349 }
350
351 zCap[i] = 0;
352 zPw = P("pw");
353 zLogin = P("login");
@@ -432,11 +432,11 @@
432 zInfo = db_text("", "SELECT info FROM user WHERE uid=%d", uid);
433 zCap = db_text("", "SELECT cap FROM user WHERE uid=%d", uid);
434 zPw = db_text("", "SELECT pw FROM user WHERE uid=%d", uid);
435 for(i=0; zCap[i]; i++){
436 char c = zCap[i];
437 if( c>='a' && c<='z' ) oa[c] = " checked=\"checked\"";
438 }
439 }
440
441 /* figure out inherited permissions */
442 memset(inherit, 0, sizeof(inherit));
443
--- src/setup.c
+++ src/setup.c
@@ -342,12 +342,12 @@
342 char zCap[50], zNm[4];
343 zNm[0] = 'a';
344 zNm[2] = 0;
345 for(i=0, c='a'; c<='z'; c++){
346 zNm[1] = c;
347 a[c&0x7f] = (c!='s' || g.perm.Setup) && P(zNm)!=0;
348 if( a[c&0x7f] ) zCap[i++] = c;
349 }
350
351 zCap[i] = 0;
352 zPw = P("pw");
353 zLogin = P("login");
@@ -432,11 +432,11 @@
432 zInfo = db_text("", "SELECT info FROM user WHERE uid=%d", uid);
433 zCap = db_text("", "SELECT cap FROM user WHERE uid=%d", uid);
434 zPw = db_text("", "SELECT pw FROM user WHERE uid=%d", uid);
435 for(i=0; zCap[i]; i++){
436 char c = zCap[i];
437 if( c>='a' && c<='z' ) oa[c&0x7f] = " checked=\"checked\"";
438 }
439 }
440
441 /* figure out inherited permissions */
442 memset(inherit, 0, sizeof(inherit));
443
M src/tkt.c
-2
--- src/tkt.c
+++ src/tkt.c
@@ -426,11 +426,10 @@
426426
 int *argl
427427
 ){
428428
 char *zDate;
429429
 const char *zUuid;
430430
 int i;
431
- int rid;
432431
 int nJ = 0;
433432
 Blob tktchng, cksum;
434433
435434
 login_verify_csrf_secret();
436435
 zUuid = (const char *)pUuid;
@@ -996,11 +995,10 @@
996995
 }
997996
 }else{
998997
 /* add a new ticket or update an existing ticket */
999998
 enum { set,add,history,err } eCmd = err;
1000999
 int i = 0;
1001
- int rid;
10021000
 Blob tktchng, cksum;
10031001
10041002
 /* get command type (set/add) and get uuid, if needed for set */
10051003
 if( strncmp(g.argv[2],"set",n)==0 || strncmp(g.argv[2],"change",n)==0 ||
10061004
 strncmp(g.argv[2],"history",n)==0 ){
10071005
--- src/tkt.c
+++ src/tkt.c
@@ -426,11 +426,10 @@
426 int *argl
427 ){
428 char *zDate;
429 const char *zUuid;
430 int i;
431 int rid;
432 int nJ = 0;
433 Blob tktchng, cksum;
434
435 login_verify_csrf_secret();
436 zUuid = (const char *)pUuid;
@@ -996,11 +995,10 @@
996 }
997 }else{
998 /* add a new ticket or update an existing ticket */
999 enum { set,add,history,err } eCmd = err;
1000 int i = 0;
1001 int rid;
1002 Blob tktchng, cksum;
1003
1004 /* get command type (set/add) and get uuid, if needed for set */
1005 if( strncmp(g.argv[2],"set",n)==0 || strncmp(g.argv[2],"change",n)==0 ||
1006 strncmp(g.argv[2],"history",n)==0 ){
1007
--- src/tkt.c
+++ src/tkt.c
@@ -426,11 +426,10 @@
426 int *argl
427 ){
428 char *zDate;
429 const char *zUuid;
430 int i;
 
431 int nJ = 0;
432 Blob tktchng, cksum;
433
434 login_verify_csrf_secret();
435 zUuid = (const char *)pUuid;
@@ -996,11 +995,10 @@
995 }
996 }else{
997 /* add a new ticket or update an existing ticket */
998 enum { set,add,history,err } eCmd = err;
999 int i = 0;
 
1000 Blob tktchng, cksum;
1001
1002 /* get command type (set/add) and get uuid, if needed for set */
1003 if( strncmp(g.argv[2],"set",n)==0 || strncmp(g.argv[2],"change",n)==0 ||
1004 strncmp(g.argv[2],"history",n)==0 ){
1005
M src/wiki.c
-5
--- src/wiki.c
+++ src/wiki.c
@@ -131,12 +131,10 @@
131131
 int isSandbox;
132132
 Blob wiki;
133133
 Manifest *pWiki = 0;
134134
 const char *zPageName;
135135
 char *zBody = mprintf("%s","<i>Empty Page</i>");
136
- Stmt q;
137
- int cnt = 0;
138136
139137
 login_check_credentials();
140138
 if( !g.perm.RdWiki ){ login_needed(); return; }
141139
 zPageName = P("name");
142140
 if( zPageName==0 ){
@@ -299,11 +297,10 @@
299297
 }
300298
 }
301299
 if( P("submit")!=0 && zBody!=0 ){
302300
 char *zDate;
303301
 Blob cksum;
304
- int nrid;
305302
 blob_zero(&wiki);
306303
 db_begin_transaction();
307304
 if( isSandbox ){
308305
 db_set("sandbox",zBody,0);
309306
 }else{
@@ -483,11 +480,10 @@
483480
 return;
484481
 }
485482
 if( P("submit")!=0 && P("r")!=0 && P("u")!=0 ){
486483
 char *zDate;
487484
 Blob cksum;
488
- int nrid;
489485
 Blob body;
490486
 Blob wiki;
491487
 Manifest *pWiki = 0;
492488
493489
 blob_zero(&body);
@@ -814,11 +810,10 @@
814810
 */
815811
 int wiki_cmd_commit(char const * zPageName, int isNew, Blob *pContent){
816812
 Blob wiki; /* Wiki page content */
817813
 Blob cksum; /* wiki checksum */
818814
 int rid; /* artifact ID of parent page */
819
- int nrid; /* artifact ID of new wiki page */
820815
 char *zDate; /* timestamp */
821816
 char *zUuid; /* uuid for rid */
822817
823818
 rid = db_int(0,
824819
 "SELECT x.rid FROM tag t, tagxref x"
825820
--- src/wiki.c
+++ src/wiki.c
@@ -131,12 +131,10 @@
131 int isSandbox;
132 Blob wiki;
133 Manifest *pWiki = 0;
134 const char *zPageName;
135 char *zBody = mprintf("%s","<i>Empty Page</i>");
136 Stmt q;
137 int cnt = 0;
138
139 login_check_credentials();
140 if( !g.perm.RdWiki ){ login_needed(); return; }
141 zPageName = P("name");
142 if( zPageName==0 ){
@@ -299,11 +297,10 @@
299 }
300 }
301 if( P("submit")!=0 && zBody!=0 ){
302 char *zDate;
303 Blob cksum;
304 int nrid;
305 blob_zero(&wiki);
306 db_begin_transaction();
307 if( isSandbox ){
308 db_set("sandbox",zBody,0);
309 }else{
@@ -483,11 +480,10 @@
483 return;
484 }
485 if( P("submit")!=0 && P("r")!=0 && P("u")!=0 ){
486 char *zDate;
487 Blob cksum;
488 int nrid;
489 Blob body;
490 Blob wiki;
491 Manifest *pWiki = 0;
492
493 blob_zero(&body);
@@ -814,11 +810,10 @@
814 */
815 int wiki_cmd_commit(char const * zPageName, int isNew, Blob *pContent){
816 Blob wiki; /* Wiki page content */
817 Blob cksum; /* wiki checksum */
818 int rid; /* artifact ID of parent page */
819 int nrid; /* artifact ID of new wiki page */
820 char *zDate; /* timestamp */
821 char *zUuid; /* uuid for rid */
822
823 rid = db_int(0,
824 "SELECT x.rid FROM tag t, tagxref x"
825
--- src/wiki.c
+++ src/wiki.c
@@ -131,12 +131,10 @@
131 int isSandbox;
132 Blob wiki;
133 Manifest *pWiki = 0;
134 const char *zPageName;
135 char *zBody = mprintf("%s","<i>Empty Page</i>");
 
 
136
137 login_check_credentials();
138 if( !g.perm.RdWiki ){ login_needed(); return; }
139 zPageName = P("name");
140 if( zPageName==0 ){
@@ -299,11 +297,10 @@
297 }
298 }
299 if( P("submit")!=0 && zBody!=0 ){
300 char *zDate;
301 Blob cksum;
 
302 blob_zero(&wiki);
303 db_begin_transaction();
304 if( isSandbox ){
305 db_set("sandbox",zBody,0);
306 }else{
@@ -483,11 +480,10 @@
480 return;
481 }
482 if( P("submit")!=0 && P("r")!=0 && P("u")!=0 ){
483 char *zDate;
484 Blob cksum;
 
485 Blob body;
486 Blob wiki;
487 Manifest *pWiki = 0;
488
489 blob_zero(&body);
@@ -814,11 +810,10 @@
810 */
811 int wiki_cmd_commit(char const * zPageName, int isNew, Blob *pContent){
812 Blob wiki; /* Wiki page content */
813 Blob cksum; /* wiki checksum */
814 int rid; /* artifact ID of parent page */
 
815 char *zDate; /* timestamp */
816 char *zUuid; /* uuid for rid */
817
818 rid = db_int(0,
819 "SELECT x.rid FROM tag t, tagxref x"
820

Keyboard Shortcuts

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