Fossil SCM
Remove unnecessary #ifdefs and improve comments in db.c. No logic changes.
Commit
d216ea9a8466de398c54edb42016b88d36a37e7fbd7f354faca5d379f5bac855
Parent
7680076966d4b6b…
1 file changed
+8
-14
M
src/db.c
+8
-14
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -339,18 +339,14 @@ | ||
| 339 | 339 | } |
| 340 | 340 | rc = sqlite3_prepare_v3(g.db, zSql, -1, prepFlags, &pStmt->pStmt, 0); |
| 341 | 341 | if( rc!=0 && (flags & DB_PREPARE_IGNORE_ERROR)==0 ){ |
| 342 | 342 | db_err("%s\n%s", sqlite3_errmsg(g.db), zSql); |
| 343 | 343 | } |
| 344 | -#if 1 | |
| 345 | - pStmt->pNext = db.pAllStmt; | |
| 346 | - pStmt->pPrev = 0; | |
| 347 | - if( db.pAllStmt ) db.pAllStmt->pPrev = pStmt; | |
| 348 | - db.pAllStmt = pStmt; | |
| 349 | -#else | |
| 350 | - pStmt->pNext = pStmt->pPrev = 0; | |
| 351 | -#endif | |
| 344 | + pStmt->pNext = db.pAllStmt; | |
| 345 | + pStmt->pPrev = 0; | |
| 346 | + if( db.pAllStmt ) db.pAllStmt->pPrev = pStmt; | |
| 347 | + db.pAllStmt = pStmt; | |
| 352 | 348 | pStmt->nStep = 0; |
| 353 | 349 | pStmt->rc = rc; |
| 354 | 350 | return rc; |
| 355 | 351 | } |
| 356 | 352 | int db_prepare(Stmt *pStmt, const char *zFormat, ...){ |
| @@ -367,22 +363,20 @@ | ||
| 367 | 363 | va_start(ap, zFormat); |
| 368 | 364 | rc = db_vprepare(pStmt, DB_PREPARE_IGNORE_ERROR, zFormat, ap); |
| 369 | 365 | va_end(ap); |
| 370 | 366 | return rc; |
| 371 | 367 | } |
| 368 | + | |
| 369 | +/* This variant of db_prepare() checks to see if the statement has | |
| 370 | +** already been prepared, and if it has it becomes a no-op. | |
| 371 | +*/ | |
| 372 | 372 | int db_static_prepare(Stmt *pStmt, const char *zFormat, ...){ |
| 373 | 373 | int rc = SQLITE_OK; |
| 374 | 374 | if( blob_size(&pStmt->sql)==0 ){ |
| 375 | 375 | va_list ap; |
| 376 | 376 | va_start(ap, zFormat); |
| 377 | 377 | rc = db_vprepare(pStmt, DB_PREPARE_PERSISTENT, zFormat, ap); |
| 378 | -#if 0 | |
| 379 | - pStmt->pNext = db.pAllStmt; | |
| 380 | - pStmt->pPrev = 0; | |
| 381 | - if( db.pAllStmt ) db.pAllStmt->pPrev = pStmt; | |
| 382 | - db.pAllStmt = pStmt; | |
| 383 | -#endif | |
| 384 | 378 | va_end(ap); |
| 385 | 379 | } |
| 386 | 380 | return rc; |
| 387 | 381 | } |
| 388 | 382 | |
| 389 | 383 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -339,18 +339,14 @@ | |
| 339 | } |
| 340 | rc = sqlite3_prepare_v3(g.db, zSql, -1, prepFlags, &pStmt->pStmt, 0); |
| 341 | if( rc!=0 && (flags & DB_PREPARE_IGNORE_ERROR)==0 ){ |
| 342 | db_err("%s\n%s", sqlite3_errmsg(g.db), zSql); |
| 343 | } |
| 344 | #if 1 |
| 345 | pStmt->pNext = db.pAllStmt; |
| 346 | pStmt->pPrev = 0; |
| 347 | if( db.pAllStmt ) db.pAllStmt->pPrev = pStmt; |
| 348 | db.pAllStmt = pStmt; |
| 349 | #else |
| 350 | pStmt->pNext = pStmt->pPrev = 0; |
| 351 | #endif |
| 352 | pStmt->nStep = 0; |
| 353 | pStmt->rc = rc; |
| 354 | return rc; |
| 355 | } |
| 356 | int db_prepare(Stmt *pStmt, const char *zFormat, ...){ |
| @@ -367,22 +363,20 @@ | |
| 367 | va_start(ap, zFormat); |
| 368 | rc = db_vprepare(pStmt, DB_PREPARE_IGNORE_ERROR, zFormat, ap); |
| 369 | va_end(ap); |
| 370 | return rc; |
| 371 | } |
| 372 | int db_static_prepare(Stmt *pStmt, const char *zFormat, ...){ |
| 373 | int rc = SQLITE_OK; |
| 374 | if( blob_size(&pStmt->sql)==0 ){ |
| 375 | va_list ap; |
| 376 | va_start(ap, zFormat); |
| 377 | rc = db_vprepare(pStmt, DB_PREPARE_PERSISTENT, zFormat, ap); |
| 378 | #if 0 |
| 379 | pStmt->pNext = db.pAllStmt; |
| 380 | pStmt->pPrev = 0; |
| 381 | if( db.pAllStmt ) db.pAllStmt->pPrev = pStmt; |
| 382 | db.pAllStmt = pStmt; |
| 383 | #endif |
| 384 | va_end(ap); |
| 385 | } |
| 386 | return rc; |
| 387 | } |
| 388 | |
| 389 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -339,18 +339,14 @@ | |
| 339 | } |
| 340 | rc = sqlite3_prepare_v3(g.db, zSql, -1, prepFlags, &pStmt->pStmt, 0); |
| 341 | if( rc!=0 && (flags & DB_PREPARE_IGNORE_ERROR)==0 ){ |
| 342 | db_err("%s\n%s", sqlite3_errmsg(g.db), zSql); |
| 343 | } |
| 344 | pStmt->pNext = db.pAllStmt; |
| 345 | pStmt->pPrev = 0; |
| 346 | if( db.pAllStmt ) db.pAllStmt->pPrev = pStmt; |
| 347 | db.pAllStmt = pStmt; |
| 348 | pStmt->nStep = 0; |
| 349 | pStmt->rc = rc; |
| 350 | return rc; |
| 351 | } |
| 352 | int db_prepare(Stmt *pStmt, const char *zFormat, ...){ |
| @@ -367,22 +363,20 @@ | |
| 363 | va_start(ap, zFormat); |
| 364 | rc = db_vprepare(pStmt, DB_PREPARE_IGNORE_ERROR, zFormat, ap); |
| 365 | va_end(ap); |
| 366 | return rc; |
| 367 | } |
| 368 | |
| 369 | /* This variant of db_prepare() checks to see if the statement has |
| 370 | ** already been prepared, and if it has it becomes a no-op. |
| 371 | */ |
| 372 | int db_static_prepare(Stmt *pStmt, const char *zFormat, ...){ |
| 373 | int rc = SQLITE_OK; |
| 374 | if( blob_size(&pStmt->sql)==0 ){ |
| 375 | va_list ap; |
| 376 | va_start(ap, zFormat); |
| 377 | rc = db_vprepare(pStmt, DB_PREPARE_PERSISTENT, zFormat, ap); |
| 378 | va_end(ap); |
| 379 | } |
| 380 | return rc; |
| 381 | } |
| 382 | |
| 383 |