Fossil SCM
Fix some more compiler warnings seen with MSVC.
Commit
24e298edd02f9b851df1b4de74233a30ed4d2f7b
Parent
c2bed5b3db2ee48…
3 files changed
+1
-1
+1
-1
+1
-1
+1
-1
| --- src/login.c | ||
| +++ src/login.c | ||
| @@ -980,11 +980,11 @@ | ||
| 980 | 980 | /* |
| 981 | 981 | ** Zeroes out g.perm and calls login_set_capabilities(zCap,flags). |
| 982 | 982 | */ |
| 983 | 983 | void login_replace_capabilities(const char *zCap, unsigned flags){ |
| 984 | 984 | memset(&g.perm, 0, sizeof(g.perm)); |
| 985 | - return login_set_capabilities(zCap, flags); | |
| 985 | + login_set_capabilities(zCap, flags); | |
| 986 | 986 | } |
| 987 | 987 | |
| 988 | 988 | /* |
| 989 | 989 | ** If the current login lacks any of the capabilities listed in |
| 990 | 990 | ** the input, then return 0. If all capabilities are present, then |
| 991 | 991 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -980,11 +980,11 @@ | |
| 980 | /* |
| 981 | ** Zeroes out g.perm and calls login_set_capabilities(zCap,flags). |
| 982 | */ |
| 983 | void login_replace_capabilities(const char *zCap, unsigned flags){ |
| 984 | memset(&g.perm, 0, sizeof(g.perm)); |
| 985 | return login_set_capabilities(zCap, flags); |
| 986 | } |
| 987 | |
| 988 | /* |
| 989 | ** If the current login lacks any of the capabilities listed in |
| 990 | ** the input, then return 0. If all capabilities are present, then |
| 991 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -980,11 +980,11 @@ | |
| 980 | /* |
| 981 | ** Zeroes out g.perm and calls login_set_capabilities(zCap,flags). |
| 982 | */ |
| 983 | void login_replace_capabilities(const char *zCap, unsigned flags){ |
| 984 | memset(&g.perm, 0, sizeof(g.perm)); |
| 985 | login_set_capabilities(zCap, flags); |
| 986 | } |
| 987 | |
| 988 | /* |
| 989 | ** If the current login lacks any of the capabilities listed in |
| 990 | ** the input, then return 0. If all capabilities are present, then |
| 991 |
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -317,11 +317,11 @@ | ||
| 317 | 317 | |
| 318 | 318 | /* |
| 319 | 319 | ** atexit() handler which frees up "some" of the resources |
| 320 | 320 | ** used by fossil. |
| 321 | 321 | */ |
| 322 | -void fossil_atexit() { | |
| 322 | +void fossil_atexit(void) { | |
| 323 | 323 | #ifdef FOSSIL_ENABLE_JSON |
| 324 | 324 | cson_value_free(g.json.gc.v); |
| 325 | 325 | memset(&g.json, 0, sizeof(g.json)); |
| 326 | 326 | #endif |
| 327 | 327 | free(g.zErrMsg); |
| 328 | 328 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -317,11 +317,11 @@ | |
| 317 | |
| 318 | /* |
| 319 | ** atexit() handler which frees up "some" of the resources |
| 320 | ** used by fossil. |
| 321 | */ |
| 322 | void fossil_atexit() { |
| 323 | #ifdef FOSSIL_ENABLE_JSON |
| 324 | cson_value_free(g.json.gc.v); |
| 325 | memset(&g.json, 0, sizeof(g.json)); |
| 326 | #endif |
| 327 | free(g.zErrMsg); |
| 328 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -317,11 +317,11 @@ | |
| 317 | |
| 318 | /* |
| 319 | ** atexit() handler which frees up "some" of the resources |
| 320 | ** used by fossil. |
| 321 | */ |
| 322 | void fossil_atexit(void) { |
| 323 | #ifdef FOSSIL_ENABLE_JSON |
| 324 | cson_value_free(g.json.gc.v); |
| 325 | memset(&g.json, 0, sizeof(g.json)); |
| 326 | #endif |
| 327 | free(g.zErrMsg); |
| 328 |
+1
-1
| --- src/setup.c | ||
| +++ src/setup.c | ||
| @@ -250,11 +250,11 @@ | ||
| 250 | 250 | char *oaa, *oas, *oar, *oaw, *oan, *oai, *oaj, *oao, *oap; |
| 251 | 251 | char *oak, *oad, *oac, *oaf, *oam, *oah, *oag, *oae; |
| 252 | 252 | char *oat, *oau, *oav, *oab, *oax, *oaz; |
| 253 | 253 | const char *zGroup; |
| 254 | 254 | const char *zOldLogin; |
| 255 | - const char *inherit[128]; | |
| 255 | + char *inherit[128]; | |
| 256 | 256 | int doWrite; |
| 257 | 257 | int uid; |
| 258 | 258 | int higherUser = 0; /* True if user being edited is SETUP and the */ |
| 259 | 259 | /* user doing the editing is ADMIN. Disallow editing */ |
| 260 | 260 | |
| 261 | 261 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -250,11 +250,11 @@ | |
| 250 | char *oaa, *oas, *oar, *oaw, *oan, *oai, *oaj, *oao, *oap; |
| 251 | char *oak, *oad, *oac, *oaf, *oam, *oah, *oag, *oae; |
| 252 | char *oat, *oau, *oav, *oab, *oax, *oaz; |
| 253 | const char *zGroup; |
| 254 | const char *zOldLogin; |
| 255 | const char *inherit[128]; |
| 256 | int doWrite; |
| 257 | int uid; |
| 258 | int higherUser = 0; /* True if user being edited is SETUP and the */ |
| 259 | /* user doing the editing is ADMIN. Disallow editing */ |
| 260 | |
| 261 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -250,11 +250,11 @@ | |
| 250 | char *oaa, *oas, *oar, *oaw, *oan, *oai, *oaj, *oao, *oap; |
| 251 | char *oak, *oad, *oac, *oaf, *oam, *oah, *oag, *oae; |
| 252 | char *oat, *oau, *oav, *oab, *oax, *oaz; |
| 253 | const char *zGroup; |
| 254 | const char *zOldLogin; |
| 255 | char *inherit[128]; |
| 256 | int doWrite; |
| 257 | int uid; |
| 258 | int higherUser = 0; /* True if user being edited is SETUP and the */ |
| 259 | /* user doing the editing is ADMIN. Disallow editing */ |
| 260 | |
| 261 |