Fossil SCM
Fixed an incorrect const qualifier (caught by clang).
Commit
fda7c2c63dde08c6ad3487291271a27915080468
Parent
eefb31683b0e4b4…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -320,11 +320,11 @@ | ||
| 320 | 320 | while( db_step(&q)==SQLITE_ROW ){ |
| 321 | 321 | int idm = db_column_int(&q, 0); |
| 322 | 322 | int rowid = db_column_int(&q, 1); |
| 323 | 323 | int idv; |
| 324 | 324 | const char *zName; |
| 325 | - const char *zFullName; | |
| 325 | + char *zFullName; | |
| 326 | 326 | db_multi_exec( |
| 327 | 327 | "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)" |
| 328 | 328 | " SELECT %d,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d", |
| 329 | 329 | vid, idm |
| 330 | 330 | ); |
| 331 | 331 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -320,11 +320,11 @@ | |
| 320 | while( db_step(&q)==SQLITE_ROW ){ |
| 321 | int idm = db_column_int(&q, 0); |
| 322 | int rowid = db_column_int(&q, 1); |
| 323 | int idv; |
| 324 | const char *zName; |
| 325 | const char *zFullName; |
| 326 | db_multi_exec( |
| 327 | "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)" |
| 328 | " SELECT %d,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d", |
| 329 | vid, idm |
| 330 | ); |
| 331 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -320,11 +320,11 @@ | |
| 320 | while( db_step(&q)==SQLITE_ROW ){ |
| 321 | int idm = db_column_int(&q, 0); |
| 322 | int rowid = db_column_int(&q, 1); |
| 323 | int idv; |
| 324 | const char *zName; |
| 325 | char *zFullName; |
| 326 | db_multi_exec( |
| 327 | "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)" |
| 328 | " SELECT %d,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d", |
| 329 | vid, idm |
| 330 | ); |
| 331 |