Fossil SCM
Made remove_from_argv public for use by the upcoming test-import-manifest command. Fixed description of verify_all_options. Initialized variable to silence gcc warning.
Commit
da4f0c2638bf64e7a726a09cf03dda11012ca5bf
Parent
e8efbc317a008a6…
1 file changed
+3
-3
+3
-3
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -260,11 +260,11 @@ | ||
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | /* |
| 263 | 263 | ** Remove n elements from g.argv beginning with the i-th element. |
| 264 | 264 | */ |
| 265 | -static void remove_from_argv(int i, int n){ | |
| 265 | +void remove_from_argv(int i, int n){ | |
| 266 | 266 | int j; |
| 267 | 267 | for(j=i+n; j<g.argc; i++, j++){ |
| 268 | 268 | g.argv[i] = g.argv[j]; |
| 269 | 269 | } |
| 270 | 270 | g.argc = i; |
| @@ -302,11 +302,11 @@ | ||
| 302 | 302 | } |
| 303 | 303 | return zReturn; |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | /* |
| 307 | -** Verify that there are no processed command-line options. If | |
| 307 | +** Verify that there are no unprocessed command-line options. If | |
| 308 | 308 | ** Any remaining command-line argument begins with "-" print |
| 309 | 309 | ** an error message and quit. |
| 310 | 310 | */ |
| 311 | 311 | void verify_all_options(void){ |
| 312 | 312 | int i; |
| @@ -457,11 +457,11 @@ | ||
| 457 | 457 | ** Process the webpage specified by the PATH_INFO or REQUEST_URI |
| 458 | 458 | ** environment variable. |
| 459 | 459 | */ |
| 460 | 460 | static void process_one_web_page(void){ |
| 461 | 461 | const char *zPathInfo; |
| 462 | - char *zPath; | |
| 462 | + char *zPath = NULL; | |
| 463 | 463 | int idx; |
| 464 | 464 | int i, j; |
| 465 | 465 | |
| 466 | 466 | /* Find the page that the user has requested, construct and deliver that |
| 467 | 467 | ** page. |
| 468 | 468 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -260,11 +260,11 @@ | |
| 260 | } |
| 261 | |
| 262 | /* |
| 263 | ** Remove n elements from g.argv beginning with the i-th element. |
| 264 | */ |
| 265 | static void remove_from_argv(int i, int n){ |
| 266 | int j; |
| 267 | for(j=i+n; j<g.argc; i++, j++){ |
| 268 | g.argv[i] = g.argv[j]; |
| 269 | } |
| 270 | g.argc = i; |
| @@ -302,11 +302,11 @@ | |
| 302 | } |
| 303 | return zReturn; |
| 304 | } |
| 305 | |
| 306 | /* |
| 307 | ** Verify that there are no processed command-line options. If |
| 308 | ** Any remaining command-line argument begins with "-" print |
| 309 | ** an error message and quit. |
| 310 | */ |
| 311 | void verify_all_options(void){ |
| 312 | int i; |
| @@ -457,11 +457,11 @@ | |
| 457 | ** Process the webpage specified by the PATH_INFO or REQUEST_URI |
| 458 | ** environment variable. |
| 459 | */ |
| 460 | static void process_one_web_page(void){ |
| 461 | const char *zPathInfo; |
| 462 | char *zPath; |
| 463 | int idx; |
| 464 | int i, j; |
| 465 | |
| 466 | /* Find the page that the user has requested, construct and deliver that |
| 467 | ** page. |
| 468 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -260,11 +260,11 @@ | |
| 260 | } |
| 261 | |
| 262 | /* |
| 263 | ** Remove n elements from g.argv beginning with the i-th element. |
| 264 | */ |
| 265 | void remove_from_argv(int i, int n){ |
| 266 | int j; |
| 267 | for(j=i+n; j<g.argc; i++, j++){ |
| 268 | g.argv[i] = g.argv[j]; |
| 269 | } |
| 270 | g.argc = i; |
| @@ -302,11 +302,11 @@ | |
| 302 | } |
| 303 | return zReturn; |
| 304 | } |
| 305 | |
| 306 | /* |
| 307 | ** Verify that there are no unprocessed command-line options. If |
| 308 | ** Any remaining command-line argument begins with "-" print |
| 309 | ** an error message and quit. |
| 310 | */ |
| 311 | void verify_all_options(void){ |
| 312 | int i; |
| @@ -457,11 +457,11 @@ | |
| 457 | ** Process the webpage specified by the PATH_INFO or REQUEST_URI |
| 458 | ** environment variable. |
| 459 | */ |
| 460 | static void process_one_web_page(void){ |
| 461 | const char *zPathInfo; |
| 462 | char *zPath = NULL; |
| 463 | int idx; |
| 464 | int i, j; |
| 465 | |
| 466 | /* Find the page that the user has requested, construct and deliver that |
| 467 | ** page. |
| 468 |