Fossil SCM
Fix compiler warnings.
Commit
b3bac1158bd234a2037d2b11dbeb79eb89583af0
Parent
f76d912f1d93acb…
3 files changed
+1
-1
-2
+1
-2
+1
-1
| --- src/descendants.c | ||
| +++ src/descendants.c | ||
| @@ -360,11 +360,11 @@ | ||
| 360 | 360 | Blob sql; |
| 361 | 361 | int showAll = find_option("all", 0, 0)!=0; |
| 362 | 362 | int showClosed = find_option("closed", 0, 0)!=0; |
| 363 | 363 | int recomputeFlag = find_option("recompute",0,0)!=0; |
| 364 | 364 | int byBranch = find_option("bybranch",0,0)!=0; |
| 365 | - const char *zLastBr = 0; | |
| 365 | + char *zLastBr = 0; | |
| 366 | 366 | int n; |
| 367 | 367 | char zLineNo[10]; |
| 368 | 368 | |
| 369 | 369 | db_find_and_open_repository(0,0); |
| 370 | 370 | if( recomputeFlag ) leaf_rebuild(); |
| 371 | 371 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -360,11 +360,11 @@ | |
| 360 | Blob sql; |
| 361 | int showAll = find_option("all", 0, 0)!=0; |
| 362 | int showClosed = find_option("closed", 0, 0)!=0; |
| 363 | int recomputeFlag = find_option("recompute",0,0)!=0; |
| 364 | int byBranch = find_option("bybranch",0,0)!=0; |
| 365 | const char *zLastBr = 0; |
| 366 | int n; |
| 367 | char zLineNo[10]; |
| 368 | |
| 369 | db_find_and_open_repository(0,0); |
| 370 | if( recomputeFlag ) leaf_rebuild(); |
| 371 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -360,11 +360,11 @@ | |
| 360 | Blob sql; |
| 361 | int showAll = find_option("all", 0, 0)!=0; |
| 362 | int showClosed = find_option("closed", 0, 0)!=0; |
| 363 | int recomputeFlag = find_option("recompute",0,0)!=0; |
| 364 | int byBranch = find_option("bybranch",0,0)!=0; |
| 365 | char *zLastBr = 0; |
| 366 | int n; |
| 367 | char zLineNo[10]; |
| 368 | |
| 369 | db_find_and_open_repository(0,0); |
| 370 | if( recomputeFlag ) leaf_rebuild(); |
| 371 |
-2
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -620,13 +620,11 @@ | ||
| 620 | 620 | |
| 621 | 621 | /* Show the differences */ |
| 622 | 622 | for(i=0; i<nr; i++){ |
| 623 | 623 | m = R[r+i*3+1]; |
| 624 | 624 | for(j=0; j<m; j++){ |
| 625 | - char cMark = '-'; | |
| 626 | 625 | if( showLn ) appendDiffLineno(pOut, a+j+1, 0, html); |
| 627 | - if( pRe && re_dline_match(pRe, &A[a+j], 1)==0 ) cMark = ' '; | |
| 628 | 626 | appendDiffLine(pOut, '-', &A[a+j], html, pRe); |
| 629 | 627 | } |
| 630 | 628 | a += m; |
| 631 | 629 | m = R[r+i*3+2]; |
| 632 | 630 | for(j=0; j<m; j++){ |
| 633 | 631 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -620,13 +620,11 @@ | |
| 620 | |
| 621 | /* Show the differences */ |
| 622 | for(i=0; i<nr; i++){ |
| 623 | m = R[r+i*3+1]; |
| 624 | for(j=0; j<m; j++){ |
| 625 | char cMark = '-'; |
| 626 | if( showLn ) appendDiffLineno(pOut, a+j+1, 0, html); |
| 627 | if( pRe && re_dline_match(pRe, &A[a+j], 1)==0 ) cMark = ' '; |
| 628 | appendDiffLine(pOut, '-', &A[a+j], html, pRe); |
| 629 | } |
| 630 | a += m; |
| 631 | m = R[r+i*3+2]; |
| 632 | for(j=0; j<m; j++){ |
| 633 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -620,13 +620,11 @@ | |
| 620 | |
| 621 | /* Show the differences */ |
| 622 | for(i=0; i<nr; i++){ |
| 623 | m = R[r+i*3+1]; |
| 624 | for(j=0; j<m; j++){ |
| 625 | if( showLn ) appendDiffLineno(pOut, a+j+1, 0, html); |
| 626 | appendDiffLine(pOut, '-', &A[a+j], html, pRe); |
| 627 | } |
| 628 | a += m; |
| 629 | m = R[r+i*3+2]; |
| 630 | for(j=0; j<m; j++){ |
| 631 |
+1
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -1298,11 +1298,10 @@ | ||
| 1298 | 1298 | char *zV2; |
| 1299 | 1299 | const char *zRe; |
| 1300 | 1300 | ReCompiled *pRe = 0; |
| 1301 | 1301 | u64 diffFlags; |
| 1302 | 1302 | const char *zStyle = "sbsdiff"; |
| 1303 | - const char *zReErr = 0; | |
| 1304 | 1303 | |
| 1305 | 1304 | login_check_credentials(); |
| 1306 | 1305 | if( !g.perm.Read ){ login_needed(); return; } |
| 1307 | 1306 | v1 = name_to_rid_www("v1"); |
| 1308 | 1307 | v2 = name_to_rid_www("v2"); |
| @@ -1325,11 +1324,11 @@ | ||
| 1325 | 1324 | diffFlags |= DIFF_LINENO; |
| 1326 | 1325 | zStyle = "udiff"; |
| 1327 | 1326 | } |
| 1328 | 1327 | } |
| 1329 | 1328 | zRe = P("regex"); |
| 1330 | - if( zRe ) zReErr = re_compile(&pRe, zRe, 0); | |
| 1329 | + if( zRe ) re_compile(&pRe, zRe, 0); | |
| 1331 | 1330 | content_get(v1, &c1); |
| 1332 | 1331 | content_get(v2, &c2); |
| 1333 | 1332 | text_diff(&c1, &c2, pOut, pRe, diffFlags); |
| 1334 | 1333 | blob_reset(&c1); |
| 1335 | 1334 | blob_reset(&c2); |
| 1336 | 1335 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1298,11 +1298,10 @@ | |
| 1298 | char *zV2; |
| 1299 | const char *zRe; |
| 1300 | ReCompiled *pRe = 0; |
| 1301 | u64 diffFlags; |
| 1302 | const char *zStyle = "sbsdiff"; |
| 1303 | const char *zReErr = 0; |
| 1304 | |
| 1305 | login_check_credentials(); |
| 1306 | if( !g.perm.Read ){ login_needed(); return; } |
| 1307 | v1 = name_to_rid_www("v1"); |
| 1308 | v2 = name_to_rid_www("v2"); |
| @@ -1325,11 +1324,11 @@ | |
| 1325 | diffFlags |= DIFF_LINENO; |
| 1326 | zStyle = "udiff"; |
| 1327 | } |
| 1328 | } |
| 1329 | zRe = P("regex"); |
| 1330 | if( zRe ) zReErr = re_compile(&pRe, zRe, 0); |
| 1331 | content_get(v1, &c1); |
| 1332 | content_get(v2, &c2); |
| 1333 | text_diff(&c1, &c2, pOut, pRe, diffFlags); |
| 1334 | blob_reset(&c1); |
| 1335 | blob_reset(&c2); |
| 1336 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1298,11 +1298,10 @@ | |
| 1298 | char *zV2; |
| 1299 | const char *zRe; |
| 1300 | ReCompiled *pRe = 0; |
| 1301 | u64 diffFlags; |
| 1302 | const char *zStyle = "sbsdiff"; |
| 1303 | |
| 1304 | login_check_credentials(); |
| 1305 | if( !g.perm.Read ){ login_needed(); return; } |
| 1306 | v1 = name_to_rid_www("v1"); |
| 1307 | v2 = name_to_rid_www("v2"); |
| @@ -1325,11 +1324,11 @@ | |
| 1324 | diffFlags |= DIFF_LINENO; |
| 1325 | zStyle = "udiff"; |
| 1326 | } |
| 1327 | } |
| 1328 | zRe = P("regex"); |
| 1329 | if( zRe ) re_compile(&pRe, zRe, 0); |
| 1330 | content_get(v1, &c1); |
| 1331 | content_get(v2, &c2); |
| 1332 | text_diff(&c1, &c2, pOut, pRe, diffFlags); |
| 1333 | blob_reset(&c1); |
| 1334 | blob_reset(&c2); |
| 1335 |