Fossil SCM
Fix bug in the db_get_mprintf() function and its siblings introduced by the previous check-in and caused by the parameter reordering.
Commit
ad984a253796784ee94a8c2812432fb4083e4d127f84bedaaaefbb93ce3cc19b
Parent
2fac7df467ba00d…
1 file changed
+3
-3
M
src/db.c
+3
-3
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2486,30 +2486,30 @@ | ||
| 2486 | 2486 | */ |
| 2487 | 2487 | char *db_get_mprintf(const char *zDefault, const char *zFormat, ...){ |
| 2488 | 2488 | va_list ap; |
| 2489 | 2489 | char *zName; |
| 2490 | 2490 | char *zResult; |
| 2491 | - va_start(ap, zDefault); | |
| 2491 | + va_start(ap, zFormat); | |
| 2492 | 2492 | zName = vmprintf(zFormat, ap); |
| 2493 | 2493 | va_end(ap); |
| 2494 | 2494 | zResult = db_get(zName, zDefault); |
| 2495 | 2495 | fossil_free(zName); |
| 2496 | 2496 | return zResult; |
| 2497 | 2497 | } |
| 2498 | 2498 | void db_set_mprintf(const char *zNew, int iGlobal, const char *zFormat, ...){ |
| 2499 | 2499 | va_list ap; |
| 2500 | 2500 | char *zName; |
| 2501 | - va_start(ap, iGlobal); | |
| 2501 | + va_start(ap, zFormat); | |
| 2502 | 2502 | zName = vmprintf(zFormat, ap); |
| 2503 | 2503 | va_end(ap); |
| 2504 | 2504 | db_set(zName, zNew, iGlobal); |
| 2505 | 2505 | fossil_free(zName); |
| 2506 | 2506 | } |
| 2507 | 2507 | void db_unset_mprintf(int iGlobal, const char *zFormat, ...){ |
| 2508 | 2508 | va_list ap; |
| 2509 | 2509 | char *zName; |
| 2510 | - va_start(ap, iGlobal); | |
| 2510 | + va_start(ap, zFormat); | |
| 2511 | 2511 | zName = vmprintf(zFormat, ap); |
| 2512 | 2512 | va_end(ap); |
| 2513 | 2513 | db_unset(zName, iGlobal); |
| 2514 | 2514 | fossil_free(zName); |
| 2515 | 2515 | } |
| 2516 | 2516 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2486,30 +2486,30 @@ | |
| 2486 | */ |
| 2487 | char *db_get_mprintf(const char *zDefault, const char *zFormat, ...){ |
| 2488 | va_list ap; |
| 2489 | char *zName; |
| 2490 | char *zResult; |
| 2491 | va_start(ap, zDefault); |
| 2492 | zName = vmprintf(zFormat, ap); |
| 2493 | va_end(ap); |
| 2494 | zResult = db_get(zName, zDefault); |
| 2495 | fossil_free(zName); |
| 2496 | return zResult; |
| 2497 | } |
| 2498 | void db_set_mprintf(const char *zNew, int iGlobal, const char *zFormat, ...){ |
| 2499 | va_list ap; |
| 2500 | char *zName; |
| 2501 | va_start(ap, iGlobal); |
| 2502 | zName = vmprintf(zFormat, ap); |
| 2503 | va_end(ap); |
| 2504 | db_set(zName, zNew, iGlobal); |
| 2505 | fossil_free(zName); |
| 2506 | } |
| 2507 | void db_unset_mprintf(int iGlobal, const char *zFormat, ...){ |
| 2508 | va_list ap; |
| 2509 | char *zName; |
| 2510 | va_start(ap, iGlobal); |
| 2511 | zName = vmprintf(zFormat, ap); |
| 2512 | va_end(ap); |
| 2513 | db_unset(zName, iGlobal); |
| 2514 | fossil_free(zName); |
| 2515 | } |
| 2516 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2486,30 +2486,30 @@ | |
| 2486 | */ |
| 2487 | char *db_get_mprintf(const char *zDefault, const char *zFormat, ...){ |
| 2488 | va_list ap; |
| 2489 | char *zName; |
| 2490 | char *zResult; |
| 2491 | va_start(ap, zFormat); |
| 2492 | zName = vmprintf(zFormat, ap); |
| 2493 | va_end(ap); |
| 2494 | zResult = db_get(zName, zDefault); |
| 2495 | fossil_free(zName); |
| 2496 | return zResult; |
| 2497 | } |
| 2498 | void db_set_mprintf(const char *zNew, int iGlobal, const char *zFormat, ...){ |
| 2499 | va_list ap; |
| 2500 | char *zName; |
| 2501 | va_start(ap, zFormat); |
| 2502 | zName = vmprintf(zFormat, ap); |
| 2503 | va_end(ap); |
| 2504 | db_set(zName, zNew, iGlobal); |
| 2505 | fossil_free(zName); |
| 2506 | } |
| 2507 | void db_unset_mprintf(int iGlobal, const char *zFormat, ...){ |
| 2508 | va_list ap; |
| 2509 | char *zName; |
| 2510 | va_start(ap, zFormat); |
| 2511 | zName = vmprintf(zFormat, ap); |
| 2512 | va_end(ap); |
| 2513 | db_unset(zName, iGlobal); |
| 2514 | fossil_free(zName); |
| 2515 | } |
| 2516 |