Fossil SCM
Fix harmless compiler warnings.
Commit
c9db8c79586fc2bfcd463ecb4e1dde61a0c88dc1
Parent
924315bdfc2e338…
2 files changed
+4
+1
-1
+4
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -2241,11 +2241,13 @@ | ||
| 2241 | 2241 | const char *zBrowser; /* Name of web browser program */ |
| 2242 | 2242 | char *zBrowserCmd = 0; /* Command to launch the web browser */ |
| 2243 | 2243 | int isUiCmd; /* True if command is "ui", not "server' */ |
| 2244 | 2244 | const char *zNotFound; /* The --notfound option or NULL */ |
| 2245 | 2245 | int flags = 0; /* Server flags */ |
| 2246 | +#if !defined(_WIN32) | |
| 2246 | 2247 | int noJail; /* Do not enter the chroot jail */ |
| 2248 | +#endif | |
| 2247 | 2249 | const char *zAltBase; /* Argument to the --baseurl option */ |
| 2248 | 2250 | const char *zFileGlob; /* Static content must match this */ |
| 2249 | 2251 | char *zIpAddr = 0; /* Bind to this IP address */ |
| 2250 | 2252 | |
| 2251 | 2253 | #if defined(_WIN32) |
| @@ -2260,11 +2262,13 @@ | ||
| 2260 | 2262 | zFileGlob = z; |
| 2261 | 2263 | }else{ |
| 2262 | 2264 | zFileGlob = find_option("files",0,1); |
| 2263 | 2265 | } |
| 2264 | 2266 | skin_override(); |
| 2267 | +#if !defined(_WIN32) | |
| 2265 | 2268 | noJail = find_option("nojail",0,0)!=0; |
| 2269 | +#endif | |
| 2266 | 2270 | g.useLocalauth = find_option("localauth", 0, 0)!=0; |
| 2267 | 2271 | Th_InitTraceLog(); |
| 2268 | 2272 | zPort = find_option("port", "P", 1); |
| 2269 | 2273 | zNotFound = find_option("notfound", 0, 1); |
| 2270 | 2274 | zAltBase = find_option("baseurl", 0, 1); |
| 2271 | 2275 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2241,11 +2241,13 @@ | |
| 2241 | const char *zBrowser; /* Name of web browser program */ |
| 2242 | char *zBrowserCmd = 0; /* Command to launch the web browser */ |
| 2243 | int isUiCmd; /* True if command is "ui", not "server' */ |
| 2244 | const char *zNotFound; /* The --notfound option or NULL */ |
| 2245 | int flags = 0; /* Server flags */ |
| 2246 | int noJail; /* Do not enter the chroot jail */ |
| 2247 | const char *zAltBase; /* Argument to the --baseurl option */ |
| 2248 | const char *zFileGlob; /* Static content must match this */ |
| 2249 | char *zIpAddr = 0; /* Bind to this IP address */ |
| 2250 | |
| 2251 | #if defined(_WIN32) |
| @@ -2260,11 +2262,13 @@ | |
| 2260 | zFileGlob = z; |
| 2261 | }else{ |
| 2262 | zFileGlob = find_option("files",0,1); |
| 2263 | } |
| 2264 | skin_override(); |
| 2265 | noJail = find_option("nojail",0,0)!=0; |
| 2266 | g.useLocalauth = find_option("localauth", 0, 0)!=0; |
| 2267 | Th_InitTraceLog(); |
| 2268 | zPort = find_option("port", "P", 1); |
| 2269 | zNotFound = find_option("notfound", 0, 1); |
| 2270 | zAltBase = find_option("baseurl", 0, 1); |
| 2271 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2241,11 +2241,13 @@ | |
| 2241 | const char *zBrowser; /* Name of web browser program */ |
| 2242 | char *zBrowserCmd = 0; /* Command to launch the web browser */ |
| 2243 | int isUiCmd; /* True if command is "ui", not "server' */ |
| 2244 | const char *zNotFound; /* The --notfound option or NULL */ |
| 2245 | int flags = 0; /* Server flags */ |
| 2246 | #if !defined(_WIN32) |
| 2247 | int noJail; /* Do not enter the chroot jail */ |
| 2248 | #endif |
| 2249 | const char *zAltBase; /* Argument to the --baseurl option */ |
| 2250 | const char *zFileGlob; /* Static content must match this */ |
| 2251 | char *zIpAddr = 0; /* Bind to this IP address */ |
| 2252 | |
| 2253 | #if defined(_WIN32) |
| @@ -2260,11 +2262,13 @@ | |
| 2262 | zFileGlob = z; |
| 2263 | }else{ |
| 2264 | zFileGlob = find_option("files",0,1); |
| 2265 | } |
| 2266 | skin_override(); |
| 2267 | #if !defined(_WIN32) |
| 2268 | noJail = find_option("nojail",0,0)!=0; |
| 2269 | #endif |
| 2270 | g.useLocalauth = find_option("localauth", 0, 0)!=0; |
| 2271 | Th_InitTraceLog(); |
| 2272 | zPort = find_option("port", "P", 1); |
| 2273 | zNotFound = find_option("notfound", 0, 1); |
| 2274 | zAltBase = find_option("baseurl", 0, 1); |
| 2275 |
+1
-1
| --- src/search.c | ||
| +++ src/search.c | ||
| @@ -1647,11 +1647,11 @@ | ||
| 1647 | 1647 | { "search-ckin", "check-in search:", "c" }, |
| 1648 | 1648 | { "search-doc", "document search:", "d" }, |
| 1649 | 1649 | { "search-tkt", "ticket search:", "t" }, |
| 1650 | 1650 | { "search-wiki", "wiki search:", "w" }, |
| 1651 | 1651 | }; |
| 1652 | - char *zSubCmd; | |
| 1652 | + char *zSubCmd = 0; | |
| 1653 | 1653 | int i, j, n; |
| 1654 | 1654 | int iCmd = 0; |
| 1655 | 1655 | int iAction = 0; |
| 1656 | 1656 | db_find_and_open_repository(0, 0); |
| 1657 | 1657 | if( g.argc>2 ){ |
| 1658 | 1658 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -1647,11 +1647,11 @@ | |
| 1647 | { "search-ckin", "check-in search:", "c" }, |
| 1648 | { "search-doc", "document search:", "d" }, |
| 1649 | { "search-tkt", "ticket search:", "t" }, |
| 1650 | { "search-wiki", "wiki search:", "w" }, |
| 1651 | }; |
| 1652 | char *zSubCmd; |
| 1653 | int i, j, n; |
| 1654 | int iCmd = 0; |
| 1655 | int iAction = 0; |
| 1656 | db_find_and_open_repository(0, 0); |
| 1657 | if( g.argc>2 ){ |
| 1658 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -1647,11 +1647,11 @@ | |
| 1647 | { "search-ckin", "check-in search:", "c" }, |
| 1648 | { "search-doc", "document search:", "d" }, |
| 1649 | { "search-tkt", "ticket search:", "t" }, |
| 1650 | { "search-wiki", "wiki search:", "w" }, |
| 1651 | }; |
| 1652 | char *zSubCmd = 0; |
| 1653 | int i, j, n; |
| 1654 | int iCmd = 0; |
| 1655 | int iAction = 0; |
| 1656 | db_find_and_open_repository(0, 0); |
| 1657 | if( g.argc>2 ){ |
| 1658 |