Fossil SCM
reverted that switch to sqlite3_mprintf() - i did not realize that vmprintf() is implemented locally. Changed some %s to %t/%T.
Commit
bb05bf6d36377e135361d0a4418ebc61aa01fb26
Parent
517d0ef8a5c88c8…
2 files changed
+2
-2
+1
-1
+2
-2
| --- src/json.c | ||
| +++ src/json.c | ||
| @@ -378,14 +378,14 @@ | ||
| 378 | 378 | cson_value * json_new_string_f( char const * fmt, ... ){ |
| 379 | 379 | cson_value * v; |
| 380 | 380 | char * zStr; |
| 381 | 381 | va_list vargs; |
| 382 | 382 | va_start(vargs,fmt); |
| 383 | - zStr = sqlite3_vmprintf(fmt,vargs); | |
| 383 | + zStr = vmprintf(fmt,vargs); | |
| 384 | 384 | va_end(vargs); |
| 385 | 385 | v = cson_value_new_string(zStr, strlen(zStr)); |
| 386 | - sqlite3_free(zStr); | |
| 386 | + free(zStr); | |
| 387 | 387 | return v; |
| 388 | 388 | } |
| 389 | 389 | |
| 390 | 390 | cson_value * json_new_int( int v ){ |
| 391 | 391 | return cson_value_new_integer((cson_int_t)v); |
| 392 | 392 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -378,14 +378,14 @@ | |
| 378 | cson_value * json_new_string_f( char const * fmt, ... ){ |
| 379 | cson_value * v; |
| 380 | char * zStr; |
| 381 | va_list vargs; |
| 382 | va_start(vargs,fmt); |
| 383 | zStr = sqlite3_vmprintf(fmt,vargs); |
| 384 | va_end(vargs); |
| 385 | v = cson_value_new_string(zStr, strlen(zStr)); |
| 386 | sqlite3_free(zStr); |
| 387 | return v; |
| 388 | } |
| 389 | |
| 390 | cson_value * json_new_int( int v ){ |
| 391 | return cson_value_new_integer((cson_int_t)v); |
| 392 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -378,14 +378,14 @@ | |
| 378 | cson_value * json_new_string_f( char const * fmt, ... ){ |
| 379 | cson_value * v; |
| 380 | char * zStr; |
| 381 | va_list vargs; |
| 382 | va_start(vargs,fmt); |
| 383 | zStr = vmprintf(fmt,vargs); |
| 384 | va_end(vargs); |
| 385 | v = cson_value_new_string(zStr, strlen(zStr)); |
| 386 | free(zStr); |
| 387 | return v; |
| 388 | } |
| 389 | |
| 390 | cson_value * json_new_int( int v ){ |
| 391 | return cson_value_new_integer((cson_int_t)v); |
| 392 |
+1
-1
| --- src/json_dir.c | ||
| +++ src/json_dir.c | ||
| @@ -274,11 +274,11 @@ | ||
| 274 | 274 | cson_object_set_s(zEntry, zKeySize, |
| 275 | 275 | cson_value_new_integer( (cson_int_t)sz )); |
| 276 | 276 | cson_object_set_s(zEntry, zKeyTime, |
| 277 | 277 | cson_value_new_integer( (cson_int_t)ts )); |
| 278 | 278 | cson_object_set_s(zEntry, zKeyRaw, |
| 279 | - json_new_string_f("/raw/%s?name=%s", | |
| 279 | + json_new_string_f("/raw/%T?name=%t", | |
| 280 | 280 | fullName, u)); |
| 281 | 281 | } |
| 282 | 282 | } |
| 283 | 283 | db_finalize(&q); |
| 284 | 284 | if(pM){ |
| 285 | 285 |
| --- src/json_dir.c | |
| +++ src/json_dir.c | |
| @@ -274,11 +274,11 @@ | |
| 274 | cson_object_set_s(zEntry, zKeySize, |
| 275 | cson_value_new_integer( (cson_int_t)sz )); |
| 276 | cson_object_set_s(zEntry, zKeyTime, |
| 277 | cson_value_new_integer( (cson_int_t)ts )); |
| 278 | cson_object_set_s(zEntry, zKeyRaw, |
| 279 | json_new_string_f("/raw/%s?name=%s", |
| 280 | fullName, u)); |
| 281 | } |
| 282 | } |
| 283 | db_finalize(&q); |
| 284 | if(pM){ |
| 285 |
| --- src/json_dir.c | |
| +++ src/json_dir.c | |
| @@ -274,11 +274,11 @@ | |
| 274 | cson_object_set_s(zEntry, zKeySize, |
| 275 | cson_value_new_integer( (cson_int_t)sz )); |
| 276 | cson_object_set_s(zEntry, zKeyTime, |
| 277 | cson_value_new_integer( (cson_int_t)ts )); |
| 278 | cson_object_set_s(zEntry, zKeyRaw, |
| 279 | json_new_string_f("/raw/%T?name=%t", |
| 280 | fullName, u)); |
| 281 | } |
| 282 | } |
| 283 | db_finalize(&q); |
| 284 | if(pM){ |
| 285 |