Fossil SCM
Police various compiler warnings.
Commit
536fb1d6e0d4f022b55437700805b9946f652bee
Parent
d0233e1792297d9…
4 files changed
+3
-1
+1
-1
+5
-4
+1
-1
+3
-1
| --- src/merge3.c | ||
| +++ src/merge3.c | ||
| @@ -27,11 +27,13 @@ | ||
| 27 | 27 | #define DEBUG(X) |
| 28 | 28 | #define ISDEBUG 0 |
| 29 | 29 | #endif |
| 30 | 30 | |
| 31 | 31 | /* The minimum of two integers */ |
| 32 | -#define min(A,B) (A<B?A:B) | |
| 32 | +#ifndef min | |
| 33 | +# define min(A,B) (A<B?A:B) | |
| 34 | +#endif | |
| 33 | 35 | |
| 34 | 36 | /* |
| 35 | 37 | ** Compare N lines of text from pV1 and pV2. If the lines |
| 36 | 38 | ** are the same, return true. Return false if one or more of the N |
| 37 | 39 | ** lines are different. |
| 38 | 40 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -27,11 +27,13 @@ | |
| 27 | #define DEBUG(X) |
| 28 | #define ISDEBUG 0 |
| 29 | #endif |
| 30 | |
| 31 | /* The minimum of two integers */ |
| 32 | #define min(A,B) (A<B?A:B) |
| 33 | |
| 34 | /* |
| 35 | ** Compare N lines of text from pV1 and pV2. If the lines |
| 36 | ** are the same, return true. Return false if one or more of the N |
| 37 | ** lines are different. |
| 38 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -27,11 +27,13 @@ | |
| 27 | #define DEBUG(X) |
| 28 | #define ISDEBUG 0 |
| 29 | #endif |
| 30 | |
| 31 | /* The minimum of two integers */ |
| 32 | #ifndef min |
| 33 | # define min(A,B) (A<B?A:B) |
| 34 | #endif |
| 35 | |
| 36 | /* |
| 37 | ** Compare N lines of text from pV1 and pV2. If the lines |
| 38 | ** are the same, return true. Return false if one or more of the N |
| 39 | ** lines are different. |
| 40 |
+1
-1
| --- src/name.c | ||
| +++ src/name.c | ||
| @@ -426,11 +426,11 @@ | ||
| 426 | 426 | db_prepare(&q, |
| 427 | 427 | "SELECT type, datetime(mtime,'localtime')," |
| 428 | 428 | " coalesce(euser,user), coalesce(ecomment,comment)" |
| 429 | 429 | " FROM event WHERE objid=%d", rid); |
| 430 | 430 | if( db_step(&q)==SQLITE_ROW ){ |
| 431 | - const char *zType; | |
| 431 | + const char *zType = 0; | |
| 432 | 432 | switch( db_column_text(&q,0)[0] ){ |
| 433 | 433 | case 'c': zType = "Check-in"; break; |
| 434 | 434 | case 'w': zType = "Wiki-edit"; break; |
| 435 | 435 | case 'e': zType = "Event"; break; |
| 436 | 436 | case 't': zType = "Ticket-change"; break; |
| 437 | 437 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -426,11 +426,11 @@ | |
| 426 | db_prepare(&q, |
| 427 | "SELECT type, datetime(mtime,'localtime')," |
| 428 | " coalesce(euser,user), coalesce(ecomment,comment)" |
| 429 | " FROM event WHERE objid=%d", rid); |
| 430 | if( db_step(&q)==SQLITE_ROW ){ |
| 431 | const char *zType; |
| 432 | switch( db_column_text(&q,0)[0] ){ |
| 433 | case 'c': zType = "Check-in"; break; |
| 434 | case 'w': zType = "Wiki-edit"; break; |
| 435 | case 'e': zType = "Event"; break; |
| 436 | case 't': zType = "Ticket-change"; break; |
| 437 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -426,11 +426,11 @@ | |
| 426 | db_prepare(&q, |
| 427 | "SELECT type, datetime(mtime,'localtime')," |
| 428 | " coalesce(euser,user), coalesce(ecomment,comment)" |
| 429 | " FROM event WHERE objid=%d", rid); |
| 430 | if( db_step(&q)==SQLITE_ROW ){ |
| 431 | const char *zType = 0; |
| 432 | switch( db_column_text(&q,0)[0] ){ |
| 433 | case 'c': zType = "Check-in"; break; |
| 434 | case 'w': zType = "Wiki-edit"; break; |
| 435 | case 'e': zType = "Event"; break; |
| 436 | case 't': zType = "Ticket-change"; break; |
| 437 |
+5
-4
| --- src/th_main.c | ||
| +++ src/th_main.c | ||
| @@ -19,10 +19,15 @@ | ||
| 19 | 19 | ** (an independent project) and fossil. |
| 20 | 20 | */ |
| 21 | 21 | #include "config.h" |
| 22 | 22 | #include "th_main.h" |
| 23 | 23 | |
| 24 | +/* | |
| 25 | +** Interfaces to register the scripting language extensions. | |
| 26 | +*/ | |
| 27 | +int register_tcl(Jim_Interp *interp, void *pContext); /* th_tcl.c */ | |
| 28 | + | |
| 24 | 29 | /* |
| 25 | 30 | ** Generate a TH1 trace message if debugging is enabled. |
| 26 | 31 | */ |
| 27 | 32 | void Th_Trace(const char *zFormat, ...){ |
| 28 | 33 | va_list ap; |
| @@ -231,16 +236,12 @@ | ||
| 231 | 236 | Jim_WrongNumArgs(interp, 1, argv, "NAME TEXT-LIST NUMLINES"); |
| 232 | 237 | return JIM_ERR; |
| 233 | 238 | } |
| 234 | 239 | if( enableOutput ){ |
| 235 | 240 | long height; |
| 236 | - int nValue; | |
| 237 | - const char *zValue; | |
| 238 | 241 | char *z, *zH; |
| 239 | 242 | int nElem; |
| 240 | - int *aszElem; | |
| 241 | - char **azElem; | |
| 242 | 243 | int i; |
| 243 | 244 | Jim_Obj *objPtr; |
| 244 | 245 | Jim_Obj *varObjPtr; |
| 245 | 246 | |
| 246 | 247 | if( Jim_GetLong(interp, argv[3], &height) ) return JIM_ERR; |
| 247 | 248 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -19,10 +19,15 @@ | |
| 19 | ** (an independent project) and fossil. |
| 20 | */ |
| 21 | #include "config.h" |
| 22 | #include "th_main.h" |
| 23 | |
| 24 | /* |
| 25 | ** Generate a TH1 trace message if debugging is enabled. |
| 26 | */ |
| 27 | void Th_Trace(const char *zFormat, ...){ |
| 28 | va_list ap; |
| @@ -231,16 +236,12 @@ | |
| 231 | Jim_WrongNumArgs(interp, 1, argv, "NAME TEXT-LIST NUMLINES"); |
| 232 | return JIM_ERR; |
| 233 | } |
| 234 | if( enableOutput ){ |
| 235 | long height; |
| 236 | int nValue; |
| 237 | const char *zValue; |
| 238 | char *z, *zH; |
| 239 | int nElem; |
| 240 | int *aszElem; |
| 241 | char **azElem; |
| 242 | int i; |
| 243 | Jim_Obj *objPtr; |
| 244 | Jim_Obj *varObjPtr; |
| 245 | |
| 246 | if( Jim_GetLong(interp, argv[3], &height) ) return JIM_ERR; |
| 247 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -19,10 +19,15 @@ | |
| 19 | ** (an independent project) and fossil. |
| 20 | */ |
| 21 | #include "config.h" |
| 22 | #include "th_main.h" |
| 23 | |
| 24 | /* |
| 25 | ** Interfaces to register the scripting language extensions. |
| 26 | */ |
| 27 | int register_tcl(Jim_Interp *interp, void *pContext); /* th_tcl.c */ |
| 28 | |
| 29 | /* |
| 30 | ** Generate a TH1 trace message if debugging is enabled. |
| 31 | */ |
| 32 | void Th_Trace(const char *zFormat, ...){ |
| 33 | va_list ap; |
| @@ -231,16 +236,12 @@ | |
| 236 | Jim_WrongNumArgs(interp, 1, argv, "NAME TEXT-LIST NUMLINES"); |
| 237 | return JIM_ERR; |
| 238 | } |
| 239 | if( enableOutput ){ |
| 240 | long height; |
| 241 | char *z, *zH; |
| 242 | int nElem; |
| 243 | int i; |
| 244 | Jim_Obj *objPtr; |
| 245 | Jim_Obj *varObjPtr; |
| 246 | |
| 247 | if( Jim_GetLong(interp, argv[3], &height) ) return JIM_ERR; |
| 248 |
+1
-1
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -98,11 +98,11 @@ | ||
| 98 | 98 | ** obscured. |
| 99 | 99 | */ |
| 100 | 100 | static void initializeVariablesFromDb(void){ |
| 101 | 101 | const char *zName; |
| 102 | 102 | Stmt q; |
| 103 | - int i, n, size, j; | |
| 103 | + int i, n, j; | |
| 104 | 104 | |
| 105 | 105 | zName = PD("name","-none-"); |
| 106 | 106 | db_prepare(&q, "SELECT datetime(tkt_mtime,'localtime') AS tkt_datetime, *" |
| 107 | 107 | " FROM ticket WHERE tkt_uuid GLOB '%q*'", zName); |
| 108 | 108 | if( db_step(&q)==SQLITE_ROW ){ |
| 109 | 109 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -98,11 +98,11 @@ | |
| 98 | ** obscured. |
| 99 | */ |
| 100 | static void initializeVariablesFromDb(void){ |
| 101 | const char *zName; |
| 102 | Stmt q; |
| 103 | int i, n, size, j; |
| 104 | |
| 105 | zName = PD("name","-none-"); |
| 106 | db_prepare(&q, "SELECT datetime(tkt_mtime,'localtime') AS tkt_datetime, *" |
| 107 | " FROM ticket WHERE tkt_uuid GLOB '%q*'", zName); |
| 108 | if( db_step(&q)==SQLITE_ROW ){ |
| 109 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -98,11 +98,11 @@ | |
| 98 | ** obscured. |
| 99 | */ |
| 100 | static void initializeVariablesFromDb(void){ |
| 101 | const char *zName; |
| 102 | Stmt q; |
| 103 | int i, n, j; |
| 104 | |
| 105 | zName = PD("name","-none-"); |
| 106 | db_prepare(&q, "SELECT datetime(tkt_mtime,'localtime') AS tkt_datetime, *" |
| 107 | " FROM ticket WHERE tkt_uuid GLOB '%q*'", zName); |
| 108 | if( db_step(&q)==SQLITE_ROW ){ |
| 109 |