Fossil SCM
Fix harmless compiler warnings.
Commit
fd35e3396a86fb1bf025c66916486a30d4231977
Parent
b9573e55c2933b5…
2 files changed
+2
-1
+2
M
src/db.c
+2
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1808,14 +1808,15 @@ | ||
| 1808 | 1808 | char c = i==argc-1 ? '\n' : ' '; |
| 1809 | 1809 | fossil_print("%s%c", sqlite3_value_text(argv[i]), c); |
| 1810 | 1810 | } |
| 1811 | 1811 | } |
| 1812 | 1812 | } |
| 1813 | -LOCAL int db_sql_trace(int m, void *notUsed, void *pNotUsed2, void *pX){ | |
| 1813 | +LOCAL int db_sql_trace(unsigned m, void *notUsed, void *pNotUsed2, void *pX){ | |
| 1814 | 1814 | const char *zSql = (const char*)pX; |
| 1815 | 1815 | int n = strlen(zSql); |
| 1816 | 1816 | fossil_trace("%s%s\n", zSql, (n>0 && zSql[n-1]==';') ? "" : ";"); |
| 1817 | + return 0; | |
| 1817 | 1818 | } |
| 1818 | 1819 | |
| 1819 | 1820 | /* |
| 1820 | 1821 | ** Implement the user() SQL function. user() takes no arguments and |
| 1821 | 1822 | ** returns the user ID of the current user. |
| 1822 | 1823 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1808,14 +1808,15 @@ | |
| 1808 | char c = i==argc-1 ? '\n' : ' '; |
| 1809 | fossil_print("%s%c", sqlite3_value_text(argv[i]), c); |
| 1810 | } |
| 1811 | } |
| 1812 | } |
| 1813 | LOCAL int db_sql_trace(int m, void *notUsed, void *pNotUsed2, void *pX){ |
| 1814 | const char *zSql = (const char*)pX; |
| 1815 | int n = strlen(zSql); |
| 1816 | fossil_trace("%s%s\n", zSql, (n>0 && zSql[n-1]==';') ? "" : ";"); |
| 1817 | } |
| 1818 | |
| 1819 | /* |
| 1820 | ** Implement the user() SQL function. user() takes no arguments and |
| 1821 | ** returns the user ID of the current user. |
| 1822 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1808,14 +1808,15 @@ | |
| 1808 | char c = i==argc-1 ? '\n' : ' '; |
| 1809 | fossil_print("%s%c", sqlite3_value_text(argv[i]), c); |
| 1810 | } |
| 1811 | } |
| 1812 | } |
| 1813 | LOCAL int db_sql_trace(unsigned m, void *notUsed, void *pNotUsed2, void *pX){ |
| 1814 | const char *zSql = (const char*)pX; |
| 1815 | int n = strlen(zSql); |
| 1816 | fossil_trace("%s%s\n", zSql, (n>0 && zSql[n-1]==';') ? "" : ";"); |
| 1817 | return 0; |
| 1818 | } |
| 1819 | |
| 1820 | /* |
| 1821 | ** Implement the user() SQL function. user() takes no arguments and |
| 1822 | ** returns the user ID of the current user. |
| 1823 |
+2
| --- src/fshell.c | ||
| +++ src/fshell.c | ||
| @@ -25,10 +25,11 @@ | ||
| 25 | 25 | ** It allows multiple commands to be issued without having to reenter the |
| 26 | 26 | ** crypto phasephrase for each command. |
| 27 | 27 | */ |
| 28 | 28 | #include "config.h" |
| 29 | 29 | #include "fshell.h" |
| 30 | +#include <ctype.h> | |
| 30 | 31 | |
| 31 | 32 | |
| 32 | 33 | /* |
| 33 | 34 | ** COMMAND: shell* |
| 34 | 35 | ** |
| @@ -97,10 +98,11 @@ | ||
| 97 | 98 | fflush(stdout); |
| 98 | 99 | continue; |
| 99 | 100 | } |
| 100 | 101 | if( childPid==0 ){ |
| 101 | 102 | /* This is the child process */ |
| 103 | + int main(int, char**); | |
| 102 | 104 | main(nArg, azArg); |
| 103 | 105 | exit(0); |
| 104 | 106 | }else{ |
| 105 | 107 | /* The parent process */ |
| 106 | 108 | int status; |
| 107 | 109 |
| --- src/fshell.c | |
| +++ src/fshell.c | |
| @@ -25,10 +25,11 @@ | |
| 25 | ** It allows multiple commands to be issued without having to reenter the |
| 26 | ** crypto phasephrase for each command. |
| 27 | */ |
| 28 | #include "config.h" |
| 29 | #include "fshell.h" |
| 30 | |
| 31 | |
| 32 | /* |
| 33 | ** COMMAND: shell* |
| 34 | ** |
| @@ -97,10 +98,11 @@ | |
| 97 | fflush(stdout); |
| 98 | continue; |
| 99 | } |
| 100 | if( childPid==0 ){ |
| 101 | /* This is the child process */ |
| 102 | main(nArg, azArg); |
| 103 | exit(0); |
| 104 | }else{ |
| 105 | /* The parent process */ |
| 106 | int status; |
| 107 |
| --- src/fshell.c | |
| +++ src/fshell.c | |
| @@ -25,10 +25,11 @@ | |
| 25 | ** It allows multiple commands to be issued without having to reenter the |
| 26 | ** crypto phasephrase for each command. |
| 27 | */ |
| 28 | #include "config.h" |
| 29 | #include "fshell.h" |
| 30 | #include <ctype.h> |
| 31 | |
| 32 | |
| 33 | /* |
| 34 | ** COMMAND: shell* |
| 35 | ** |
| @@ -97,10 +98,11 @@ | |
| 98 | fflush(stdout); |
| 99 | continue; |
| 100 | } |
| 101 | if( childPid==0 ){ |
| 102 | /* This is the child process */ |
| 103 | int main(int, char**); |
| 104 | main(nArg, azArg); |
| 105 | exit(0); |
| 106 | }else{ |
| 107 | /* The parent process */ |
| 108 | int status; |
| 109 |