Fossil SCM
Typo in variable name.
Commit
1cd36fad6d7a8f25607179f7fcbd0090c4b86abcb82bb0a9bcf85ac684924d71
Parent
f9686d02de6245a…
1 file changed
+3
-3
+3
-3
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -218,18 +218,18 @@ | ||
| 218 | 218 | |
| 219 | 219 | /* |
| 220 | 220 | ** Print the content of the VFILE table on standard output, for |
| 221 | 221 | ** debugging purposes. |
| 222 | 222 | */ |
| 223 | -static void debug_show_vfile(int shoeAll){ | |
| 223 | +static void debug_show_vfile(int showAll){ | |
| 224 | 224 | Stmt q; |
| 225 | 225 | int pvid = -1; |
| 226 | 226 | db_prepare(&q, |
| 227 | 227 | "SELECT vid, id, chnged, deleted, isexe, islink, rid, mrid, mtime," |
| 228 | 228 | " pathname, origname, mhash, %s FROM vfile" |
| 229 | 229 | " ORDER BY vid, pathname", |
| 230 | - shoeAll ? "COALESCE(datetime(mtime, 'unixepoch', 'localtime'), 'NULL')" : "''" | |
| 230 | + showAll ? "COALESCE(datetime(mtime, 'unixepoch', 'localtime'), 'NULL')" : "''" | |
| 231 | 231 | ); |
| 232 | 232 | while( db_step(&q)==SQLITE_ROW ){ |
| 233 | 233 | int vid = db_column_int(&q, 0); |
| 234 | 234 | int chnged = db_column_int(&q, 2); |
| 235 | 235 | int dltd = db_column_int(&q, 3); |
| @@ -253,11 +253,11 @@ | ||
| 253 | 253 | if( zOrig && zOrig[0] ){ |
| 254 | 254 | fossil_print(" <- %s\n", zOrig); |
| 255 | 255 | }else{ |
| 256 | 256 | fossil_print("\n"); |
| 257 | 257 | } |
| 258 | - if( shoeAll ){ | |
| 258 | + if( showAll ){ | |
| 259 | 259 | fossil_print(" mtime %19s / %-10i mhash %s\n", db_column_text(&q, 12), |
| 260 | 260 | db_column_int(&q , 8), db_column_text(&q, 11)); |
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | 263 | db_finalize(&q); |
| 264 | 264 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -218,18 +218,18 @@ | |
| 218 | |
| 219 | /* |
| 220 | ** Print the content of the VFILE table on standard output, for |
| 221 | ** debugging purposes. |
| 222 | */ |
| 223 | static void debug_show_vfile(int shoeAll){ |
| 224 | Stmt q; |
| 225 | int pvid = -1; |
| 226 | db_prepare(&q, |
| 227 | "SELECT vid, id, chnged, deleted, isexe, islink, rid, mrid, mtime," |
| 228 | " pathname, origname, mhash, %s FROM vfile" |
| 229 | " ORDER BY vid, pathname", |
| 230 | shoeAll ? "COALESCE(datetime(mtime, 'unixepoch', 'localtime'), 'NULL')" : "''" |
| 231 | ); |
| 232 | while( db_step(&q)==SQLITE_ROW ){ |
| 233 | int vid = db_column_int(&q, 0); |
| 234 | int chnged = db_column_int(&q, 2); |
| 235 | int dltd = db_column_int(&q, 3); |
| @@ -253,11 +253,11 @@ | |
| 253 | if( zOrig && zOrig[0] ){ |
| 254 | fossil_print(" <- %s\n", zOrig); |
| 255 | }else{ |
| 256 | fossil_print("\n"); |
| 257 | } |
| 258 | if( shoeAll ){ |
| 259 | fossil_print(" mtime %19s / %-10i mhash %s\n", db_column_text(&q, 12), |
| 260 | db_column_int(&q , 8), db_column_text(&q, 11)); |
| 261 | } |
| 262 | } |
| 263 | db_finalize(&q); |
| 264 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -218,18 +218,18 @@ | |
| 218 | |
| 219 | /* |
| 220 | ** Print the content of the VFILE table on standard output, for |
| 221 | ** debugging purposes. |
| 222 | */ |
| 223 | static void debug_show_vfile(int showAll){ |
| 224 | Stmt q; |
| 225 | int pvid = -1; |
| 226 | db_prepare(&q, |
| 227 | "SELECT vid, id, chnged, deleted, isexe, islink, rid, mrid, mtime," |
| 228 | " pathname, origname, mhash, %s FROM vfile" |
| 229 | " ORDER BY vid, pathname", |
| 230 | showAll ? "COALESCE(datetime(mtime, 'unixepoch', 'localtime'), 'NULL')" : "''" |
| 231 | ); |
| 232 | while( db_step(&q)==SQLITE_ROW ){ |
| 233 | int vid = db_column_int(&q, 0); |
| 234 | int chnged = db_column_int(&q, 2); |
| 235 | int dltd = db_column_int(&q, 3); |
| @@ -253,11 +253,11 @@ | |
| 253 | if( zOrig && zOrig[0] ){ |
| 254 | fossil_print(" <- %s\n", zOrig); |
| 255 | }else{ |
| 256 | fossil_print("\n"); |
| 257 | } |
| 258 | if( showAll ){ |
| 259 | fossil_print(" mtime %19s / %-10i mhash %s\n", db_column_text(&q, 12), |
| 260 | db_column_int(&q , 8), db_column_text(&q, 11)); |
| 261 | } |
| 262 | } |
| 263 | db_finalize(&q); |
| 264 |