diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-05-20 15:24:47 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-05-20 15:24:47 +0000 |
commit | 974098b7298a13068154c9a4b3cef85b6f6d9bfd (patch) | |
tree | 54db0b13cbefb68516907e5cd3cb129905ddab5c | |
parent | 49b12dbdd92e1236e1acba9314e3d991c3231132 (diff) | |
download | gnunet-974098b7298a13068154c9a4b3cef85b6f6d9bfd.tar.gz gnunet-974098b7298a13068154c9a4b3cef85b6f6d9bfd.zip |
-work around stupid GCC warning (#3791)
-rw-r--r-- | src/datastore/plugin_datastore_sqlite.c | 116 |
1 files changed, 62 insertions, 54 deletions
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index ea00e7df7..710f1e0df 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c | |||
@@ -54,7 +54,15 @@ | |||
54 | * a failure of the command 'cmd' on file 'filename' | 54 | * a failure of the command 'cmd' on file 'filename' |
55 | * with the message given by strerror(errno). | 55 | * with the message given by strerror(errno). |
56 | */ | 56 | */ |
57 | #define LOG_SQLITE(db, msg, level, cmd) do { GNUNET_log_from (level, "sqlite", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db->dbh)); if (msg != NULL) GNUNET_asprintf(msg, _("`%s' failed at %s:%u with error: %s"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db->dbh)); } while(0) | 57 | #define LOG_SQLITE(db, level, cmd) do { GNUNET_log_from (level, "sqlite", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db->dbh)); } while(0) |
58 | |||
59 | |||
60 | /** | ||
61 | * Log an error message at log-level 'level' that indicates | ||
62 | * a failure of the command 'cmd' on file 'filename' | ||
63 | * with the message given by strerror(errno). | ||
64 | */ | ||
65 | #define LOG_SQLITE_MSG(db, msg, level, cmd) do { GNUNET_log_from (level, "sqlite", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db->dbh)); GNUNET_asprintf(msg, _("`%s' failed at %s:%u with error: %s"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db->dbh)); } while(0) | ||
58 | 66 | ||
59 | 67 | ||
60 | 68 | ||
@@ -293,7 +301,7 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
293 | " hash TEXT NOT NULL DEFAULT ''," " vhash TEXT NOT NULL DEFAULT ''," | 301 | " hash TEXT NOT NULL DEFAULT ''," " vhash TEXT NOT NULL DEFAULT ''," |
294 | " value BLOB NOT NULL DEFAULT '')", NULL, NULL, NULL) != SQLITE_OK)) | 302 | " value BLOB NOT NULL DEFAULT '')", NULL, NULL, NULL) != SQLITE_OK)) |
295 | { | 303 | { |
296 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite3_exec"); | 304 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite3_exec"); |
297 | sqlite3_finalize (stmt); | 305 | sqlite3_finalize (stmt); |
298 | return GNUNET_SYSERR; | 306 | return GNUNET_SYSERR; |
299 | } | 307 | } |
@@ -353,7 +361,7 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
353 | (plugin->dbh, "DELETE FROM gn090 WHERE _ROWID_ = ?", | 361 | (plugin->dbh, "DELETE FROM gn090 WHERE _ROWID_ = ?", |
354 | &plugin->delRow) != SQLITE_OK)) | 362 | &plugin->delRow) != SQLITE_OK)) |
355 | { | 363 | { |
356 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR, "precompiling"); | 364 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "precompiling"); |
357 | return GNUNET_SYSERR; | 365 | return GNUNET_SYSERR; |
358 | } | 366 | } |
359 | 367 | ||
@@ -414,7 +422,7 @@ database_shutdown (struct Plugin *plugin) | |||
414 | } | 422 | } |
415 | #endif | 423 | #endif |
416 | if (SQLITE_OK != result) | 424 | if (SQLITE_OK != result) |
417 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite3_close"); | 425 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite3_close"); |
418 | 426 | ||
419 | GNUNET_free_non_null (plugin->fn); | 427 | GNUNET_free_non_null (plugin->fn); |
420 | } | 428 | } |
@@ -433,26 +441,26 @@ delete_by_rowid (struct Plugin *plugin, | |||
433 | { | 441 | { |
434 | if (SQLITE_OK != sqlite3_bind_int64 (plugin->delRow, 1, rid)) | 442 | if (SQLITE_OK != sqlite3_bind_int64 (plugin->delRow, 1, rid)) |
435 | { | 443 | { |
436 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 444 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
437 | "sqlite3_bind_XXXX"); | 445 | "sqlite3_bind_XXXX"); |
438 | if (SQLITE_OK != sqlite3_reset (plugin->delRow)) | 446 | if (SQLITE_OK != sqlite3_reset (plugin->delRow)) |
439 | LOG_SQLITE (plugin, NULL, | 447 | LOG_SQLITE (plugin, |
440 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 448 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
441 | "sqlite3_reset"); | 449 | "sqlite3_reset"); |
442 | return GNUNET_SYSERR; | 450 | return GNUNET_SYSERR; |
443 | } | 451 | } |
444 | if (SQLITE_DONE != sqlite3_step (plugin->delRow)) | 452 | if (SQLITE_DONE != sqlite3_step (plugin->delRow)) |
445 | { | 453 | { |
446 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 454 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
447 | "sqlite3_step"); | 455 | "sqlite3_step"); |
448 | if (SQLITE_OK != sqlite3_reset (plugin->delRow)) | 456 | if (SQLITE_OK != sqlite3_reset (plugin->delRow)) |
449 | LOG_SQLITE (plugin, NULL, | 457 | LOG_SQLITE (plugin, |
450 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 458 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
451 | "sqlite3_reset"); | 459 | "sqlite3_reset"); |
452 | return GNUNET_SYSERR; | 460 | return GNUNET_SYSERR; |
453 | } | 461 | } |
454 | if (SQLITE_OK != sqlite3_reset (plugin->delRow)) | 462 | if (SQLITE_OK != sqlite3_reset (plugin->delRow)) |
455 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 463 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
456 | "sqlite3_reset"); | 464 | "sqlite3_reset"); |
457 | return GNUNET_OK; | 465 | return GNUNET_OK; |
458 | } | 466 | } |
@@ -524,10 +532,10 @@ sqlite_plugin_put (void *cls, | |||
524 | SQLITE_TRANSIENT)) || | 532 | SQLITE_TRANSIENT)) || |
525 | (SQLITE_OK != sqlite3_bind_blob (stmt, 9, data, size, SQLITE_TRANSIENT))) | 533 | (SQLITE_OK != sqlite3_bind_blob (stmt, 9, data, size, SQLITE_TRANSIENT))) |
526 | { | 534 | { |
527 | LOG_SQLITE (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 535 | LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
528 | "sqlite3_bind_XXXX"); | 536 | "sqlite3_bind_XXXX"); |
529 | if (SQLITE_OK != sqlite3_reset (stmt)) | 537 | if (SQLITE_OK != sqlite3_reset (stmt)) |
530 | LOG_SQLITE (plugin, NULL, | 538 | LOG_SQLITE (plugin, |
531 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 539 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
532 | "sqlite3_reset"); | 540 | "sqlite3_reset"); |
533 | cont (cont_cls, key, size, GNUNET_SYSERR, msg); | 541 | cont (cont_cls, key, size, GNUNET_SYSERR, msg); |
@@ -546,15 +554,15 @@ sqlite_plugin_put (void *cls, | |||
546 | break; | 554 | break; |
547 | case SQLITE_BUSY: | 555 | case SQLITE_BUSY: |
548 | GNUNET_break (0); | 556 | GNUNET_break (0); |
549 | LOG_SQLITE (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 557 | LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
550 | "sqlite3_step"); | 558 | "sqlite3_step"); |
551 | ret = GNUNET_SYSERR; | 559 | ret = GNUNET_SYSERR; |
552 | break; | 560 | break; |
553 | default: | 561 | default: |
554 | LOG_SQLITE (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 562 | LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
555 | "sqlite3_step"); | 563 | "sqlite3_step"); |
556 | if (SQLITE_OK != sqlite3_reset (stmt)) | 564 | if (SQLITE_OK != sqlite3_reset (stmt)) |
557 | LOG_SQLITE (plugin, NULL, | 565 | LOG_SQLITE (plugin, |
558 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 566 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
559 | "sqlite3_reset"); | 567 | "sqlite3_reset"); |
560 | database_shutdown (plugin); | 568 | database_shutdown (plugin); |
@@ -564,7 +572,7 @@ sqlite_plugin_put (void *cls, | |||
564 | return; | 572 | return; |
565 | } | 573 | } |
566 | if (SQLITE_OK != sqlite3_reset (stmt)) | 574 | if (SQLITE_OK != sqlite3_reset (stmt)) |
567 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 575 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
568 | "sqlite3_reset"); | 576 | "sqlite3_reset"); |
569 | cont (cont_cls, key, size, ret, msg); | 577 | cont (cont_cls, key, size, ret, msg); |
570 | GNUNET_free_non_null(msg); | 578 | GNUNET_free_non_null(msg); |
@@ -610,10 +618,10 @@ sqlite_plugin_update (void *cls, | |||
610 | (SQLITE_OK != sqlite3_bind_int64 (plugin->updPrio, 2, expire.abs_value_us)) | 618 | (SQLITE_OK != sqlite3_bind_int64 (plugin->updPrio, 2, expire.abs_value_us)) |
611 | || (SQLITE_OK != sqlite3_bind_int64 (plugin->updPrio, 3, uid))) | 619 | || (SQLITE_OK != sqlite3_bind_int64 (plugin->updPrio, 3, uid))) |
612 | { | 620 | { |
613 | LOG_SQLITE (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 621 | LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
614 | "sqlite3_bind_XXXX"); | 622 | "sqlite3_bind_XXXX"); |
615 | if (SQLITE_OK != sqlite3_reset (plugin->updPrio)) | 623 | if (SQLITE_OK != sqlite3_reset (plugin->updPrio)) |
616 | LOG_SQLITE (plugin, NULL, | 624 | LOG_SQLITE (plugin, |
617 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 625 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
618 | "sqlite3_reset"); | 626 | "sqlite3_reset"); |
619 | cont (cont_cls, GNUNET_SYSERR, msg); | 627 | cont (cont_cls, GNUNET_SYSERR, msg); |
@@ -622,7 +630,7 @@ sqlite_plugin_update (void *cls, | |||
622 | } | 630 | } |
623 | n = sqlite3_step (plugin->updPrio); | 631 | n = sqlite3_step (plugin->updPrio); |
624 | if (SQLITE_OK != sqlite3_reset (plugin->updPrio)) | 632 | if (SQLITE_OK != sqlite3_reset (plugin->updPrio)) |
625 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 633 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
626 | "sqlite3_reset"); | 634 | "sqlite3_reset"); |
627 | switch (n) | 635 | switch (n) |
628 | { | 636 | { |
@@ -631,15 +639,15 @@ sqlite_plugin_update (void *cls, | |||
631 | cont (cont_cls, GNUNET_OK, NULL); | 639 | cont (cont_cls, GNUNET_OK, NULL); |
632 | return; | 640 | return; |
633 | case SQLITE_BUSY: | 641 | case SQLITE_BUSY: |
634 | LOG_SQLITE (plugin, &msg, | 642 | LOG_SQLITE_MSG (plugin, &msg, |
635 | GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, | 643 | GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, |
636 | "sqlite3_step"); | 644 | "sqlite3_step"); |
637 | cont (cont_cls, GNUNET_NO, msg); | 645 | cont (cont_cls, GNUNET_NO, msg); |
638 | GNUNET_free_non_null(msg); | 646 | GNUNET_free_non_null(msg); |
639 | return; | 647 | return; |
640 | default: | 648 | default: |
641 | LOG_SQLITE (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 649 | LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
642 | "sqlite3_step"); | 650 | "sqlite3_step"); |
643 | cont (cont_cls, GNUNET_SYSERR, msg); | 651 | cont (cont_cls, GNUNET_SYSERR, msg); |
644 | GNUNET_free_non_null(msg); | 652 | GNUNET_free_non_null(msg); |
645 | return; | 653 | return; |
@@ -679,7 +687,7 @@ execute_get (struct Plugin *plugin, | |||
679 | GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "sqlite", | 687 | GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "sqlite", |
680 | _("Invalid data in database. Trying to fix (by deletion).\n")); | 688 | _("Invalid data in database. Trying to fix (by deletion).\n")); |
681 | if (SQLITE_OK != sqlite3_reset (stmt)) | 689 | if (SQLITE_OK != sqlite3_reset (stmt)) |
682 | LOG_SQLITE (plugin, NULL, | 690 | LOG_SQLITE (plugin, |
683 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 691 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
684 | "sqlite3_reset"); | 692 | "sqlite3_reset"); |
685 | if (GNUNET_OK == delete_by_rowid (plugin, rowid)) | 693 | if (GNUNET_OK == delete_by_rowid (plugin, rowid)) |
@@ -698,7 +706,7 @@ execute_get (struct Plugin *plugin, | |||
698 | sqlite3_column_int (stmt, 2) /* anonymity */ , | 706 | sqlite3_column_int (stmt, 2) /* anonymity */ , |
699 | expiration, rowid); | 707 | expiration, rowid); |
700 | if (SQLITE_OK != sqlite3_reset (stmt)) | 708 | if (SQLITE_OK != sqlite3_reset (stmt)) |
701 | LOG_SQLITE (plugin, NULL, | 709 | LOG_SQLITE (plugin, |
702 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 710 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
703 | "sqlite3_reset"); | 711 | "sqlite3_reset"); |
704 | if ((GNUNET_NO == ret) && (GNUNET_OK == delete_by_rowid (plugin, rowid))) | 712 | if ((GNUNET_NO == ret) && (GNUNET_OK == delete_by_rowid (plugin, rowid))) |
@@ -708,7 +716,7 @@ execute_get (struct Plugin *plugin, | |||
708 | case SQLITE_DONE: | 716 | case SQLITE_DONE: |
709 | /* database must be empty */ | 717 | /* database must be empty */ |
710 | if (SQLITE_OK != sqlite3_reset (stmt)) | 718 | if (SQLITE_OK != sqlite3_reset (stmt)) |
711 | LOG_SQLITE (plugin, NULL, | 719 | LOG_SQLITE (plugin, |
712 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 720 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
713 | "sqlite3_reset"); | 721 | "sqlite3_reset"); |
714 | break; | 722 | break; |
@@ -716,10 +724,10 @@ execute_get (struct Plugin *plugin, | |||
716 | case SQLITE_ERROR: | 724 | case SQLITE_ERROR: |
717 | case SQLITE_MISUSE: | 725 | case SQLITE_MISUSE: |
718 | default: | 726 | default: |
719 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 727 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
720 | "sqlite3_step"); | 728 | "sqlite3_step"); |
721 | if (SQLITE_OK != sqlite3_reset (stmt)) | 729 | if (SQLITE_OK != sqlite3_reset (stmt)) |
722 | LOG_SQLITE (plugin, NULL, | 730 | LOG_SQLITE (plugin, |
723 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 731 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
724 | "sqlite3_reset"); | 732 | "sqlite3_reset"); |
725 | GNUNET_break (0); | 733 | GNUNET_break (0); |
@@ -728,7 +736,7 @@ execute_get (struct Plugin *plugin, | |||
728 | break; | 736 | break; |
729 | } | 737 | } |
730 | if (SQLITE_OK != sqlite3_reset (stmt)) | 738 | if (SQLITE_OK != sqlite3_reset (stmt)) |
731 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 739 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
732 | "sqlite3_reset"); | 740 | "sqlite3_reset"); |
733 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 741 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
734 | } | 742 | } |
@@ -760,10 +768,10 @@ sqlite_plugin_get_zero_anonymity (void *cls, uint64_t offset, | |||
760 | if ((SQLITE_OK != sqlite3_bind_int (stmt, 1, type)) || | 768 | if ((SQLITE_OK != sqlite3_bind_int (stmt, 1, type)) || |
761 | (SQLITE_OK != sqlite3_bind_int64 (stmt, 2, offset))) | 769 | (SQLITE_OK != sqlite3_bind_int64 (stmt, 2, offset))) |
762 | { | 770 | { |
763 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 771 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
764 | "sqlite3_bind_XXXX"); | 772 | "sqlite3_bind_XXXX"); |
765 | if (SQLITE_OK != sqlite3_reset (stmt)) | 773 | if (SQLITE_OK != sqlite3_reset (stmt)) |
766 | LOG_SQLITE (plugin, NULL, | 774 | LOG_SQLITE (plugin, |
767 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 775 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
768 | "sqlite3_reset"); | 776 | "sqlite3_reset"); |
769 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 777 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
@@ -815,7 +823,7 @@ sqlite_plugin_get_key (void *cls, | |||
815 | type == 0 ? "" : " AND type=?"); | 823 | type == 0 ? "" : " AND type=?"); |
816 | if (sq_prepare (plugin->dbh, scratch, &stmt) != SQLITE_OK) | 824 | if (sq_prepare (plugin->dbh, scratch, &stmt) != SQLITE_OK) |
817 | { | 825 | { |
818 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 826 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
819 | "sqlite_prepare"); | 827 | "sqlite_prepare"); |
820 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 828 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
821 | return; | 829 | return; |
@@ -832,7 +840,7 @@ sqlite_plugin_get_key (void *cls, | |||
832 | ret = sqlite3_bind_int (stmt, sqoff++, type); | 840 | ret = sqlite3_bind_int (stmt, sqoff++, type); |
833 | if (SQLITE_OK != ret) | 841 | if (SQLITE_OK != ret) |
834 | { | 842 | { |
835 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite_bind"); | 843 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite_bind"); |
836 | sqlite3_finalize (stmt); | 844 | sqlite3_finalize (stmt); |
837 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 845 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
838 | return; | 846 | return; |
@@ -840,7 +848,7 @@ sqlite_plugin_get_key (void *cls, | |||
840 | ret = sqlite3_step (stmt); | 848 | ret = sqlite3_step (stmt); |
841 | if (ret != SQLITE_ROW) | 849 | if (ret != SQLITE_ROW) |
842 | { | 850 | { |
843 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 851 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
844 | "sqlite_step"); | 852 | "sqlite_step"); |
845 | sqlite3_finalize (stmt); | 853 | sqlite3_finalize (stmt); |
846 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 854 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
@@ -864,7 +872,7 @@ sqlite_plugin_get_key (void *cls, | |||
864 | type == 0 ? "" : " AND type=?"); | 872 | type == 0 ? "" : " AND type=?"); |
865 | if (sq_prepare (plugin->dbh, scratch, &stmt) != SQLITE_OK) | 873 | if (sq_prepare (plugin->dbh, scratch, &stmt) != SQLITE_OK) |
866 | { | 874 | { |
867 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 875 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
868 | "sqlite_prepare"); | 876 | "sqlite_prepare"); |
869 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 877 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
870 | return; | 878 | return; |
@@ -883,7 +891,7 @@ sqlite_plugin_get_key (void *cls, | |||
883 | ret = sqlite3_bind_int64 (stmt, sqoff++, limit_off); | 891 | ret = sqlite3_bind_int64 (stmt, sqoff++, limit_off); |
884 | if (ret != SQLITE_OK) | 892 | if (ret != SQLITE_OK) |
885 | { | 893 | { |
886 | LOG_SQLITE (plugin, NULL, | 894 | LOG_SQLITE (plugin, |
887 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 895 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
888 | "sqlite_bind"); | 896 | "sqlite_bind"); |
889 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 897 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
@@ -999,7 +1007,7 @@ sqlite_plugin_get_replication (void *cls, PluginDatumProcessor proc, | |||
999 | if (SQLITE_ROW != sqlite3_step (stmt)) | 1007 | if (SQLITE_ROW != sqlite3_step (stmt)) |
1000 | { | 1008 | { |
1001 | if (SQLITE_OK != sqlite3_reset (stmt)) | 1009 | if (SQLITE_OK != sqlite3_reset (stmt)) |
1002 | LOG_SQLITE (plugin, NULL, | 1010 | LOG_SQLITE (plugin, |
1003 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1011 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1004 | "sqlite3_reset"); | 1012 | "sqlite3_reset"); |
1005 | /* DB empty */ | 1013 | /* DB empty */ |
@@ -1008,16 +1016,16 @@ sqlite_plugin_get_replication (void *cls, PluginDatumProcessor proc, | |||
1008 | } | 1016 | } |
1009 | repl = sqlite3_column_int (stmt, 0); | 1017 | repl = sqlite3_column_int (stmt, 0); |
1010 | if (SQLITE_OK != sqlite3_reset (stmt)) | 1018 | if (SQLITE_OK != sqlite3_reset (stmt)) |
1011 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1019 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1012 | "sqlite3_reset"); | 1020 | "sqlite3_reset"); |
1013 | stmt = plugin->selRepl; | 1021 | stmt = plugin->selRepl; |
1014 | rvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX); | 1022 | rvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX); |
1015 | if (SQLITE_OK != sqlite3_bind_int64 (stmt, 1, rvalue)) | 1023 | if (SQLITE_OK != sqlite3_bind_int64 (stmt, 1, rvalue)) |
1016 | { | 1024 | { |
1017 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1025 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1018 | "sqlite3_bind_XXXX"); | 1026 | "sqlite3_bind_XXXX"); |
1019 | if (SQLITE_OK != sqlite3_reset (stmt)) | 1027 | if (SQLITE_OK != sqlite3_reset (stmt)) |
1020 | LOG_SQLITE (plugin, NULL, | 1028 | LOG_SQLITE (plugin, |
1021 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1029 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1022 | "sqlite3_reset"); | 1030 | "sqlite3_reset"); |
1023 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 1031 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
@@ -1025,10 +1033,10 @@ sqlite_plugin_get_replication (void *cls, PluginDatumProcessor proc, | |||
1025 | } | 1033 | } |
1026 | if (SQLITE_OK != sqlite3_bind_int (stmt, 2, repl)) | 1034 | if (SQLITE_OK != sqlite3_bind_int (stmt, 2, repl)) |
1027 | { | 1035 | { |
1028 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1036 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1029 | "sqlite3_bind_XXXX"); | 1037 | "sqlite3_bind_XXXX"); |
1030 | if (SQLITE_OK != sqlite3_reset (stmt)) | 1038 | if (SQLITE_OK != sqlite3_reset (stmt)) |
1031 | LOG_SQLITE (plugin, NULL, | 1039 | LOG_SQLITE (plugin, |
1032 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1040 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1033 | "sqlite3_reset"); | 1041 | "sqlite3_reset"); |
1034 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 1042 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
@@ -1039,21 +1047,21 @@ sqlite_plugin_get_replication (void *cls, PluginDatumProcessor proc, | |||
1039 | { | 1047 | { |
1040 | if (SQLITE_OK != sqlite3_bind_int64 (plugin->updRepl, 1, rc.uid)) | 1048 | if (SQLITE_OK != sqlite3_bind_int64 (plugin->updRepl, 1, rc.uid)) |
1041 | { | 1049 | { |
1042 | LOG_SQLITE (plugin, NULL, | 1050 | LOG_SQLITE (plugin, |
1043 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1051 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1044 | "sqlite3_bind_XXXX"); | 1052 | "sqlite3_bind_XXXX"); |
1045 | if (SQLITE_OK != sqlite3_reset (plugin->updRepl)) | 1053 | if (SQLITE_OK != sqlite3_reset (plugin->updRepl)) |
1046 | LOG_SQLITE (plugin, NULL, | 1054 | LOG_SQLITE (plugin, |
1047 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1055 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1048 | "sqlite3_reset"); | 1056 | "sqlite3_reset"); |
1049 | return; | 1057 | return; |
1050 | } | 1058 | } |
1051 | if (SQLITE_DONE != sqlite3_step (plugin->updRepl)) | 1059 | if (SQLITE_DONE != sqlite3_step (plugin->updRepl)) |
1052 | LOG_SQLITE (plugin, NULL, | 1060 | LOG_SQLITE (plugin, |
1053 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1061 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1054 | "sqlite3_step"); | 1062 | "sqlite3_step"); |
1055 | if (SQLITE_OK != sqlite3_reset (plugin->updRepl)) | 1063 | if (SQLITE_OK != sqlite3_reset (plugin->updRepl)) |
1056 | LOG_SQLITE (plugin, NULL, | 1064 | LOG_SQLITE (plugin, |
1057 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1065 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1058 | "sqlite3_reset"); | 1066 | "sqlite3_reset"); |
1059 | } | 1067 | } |
@@ -1082,10 +1090,10 @@ sqlite_plugin_get_expiration (void *cls, PluginDatumProcessor proc, | |||
1082 | stmt = plugin->selExpi; | 1090 | stmt = plugin->selExpi; |
1083 | if (SQLITE_OK != sqlite3_bind_int64 (stmt, 1, now.abs_value_us)) | 1091 | if (SQLITE_OK != sqlite3_bind_int64 (stmt, 1, now.abs_value_us)) |
1084 | { | 1092 | { |
1085 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1093 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1086 | "sqlite3_bind_XXXX"); | 1094 | "sqlite3_bind_XXXX"); |
1087 | if (SQLITE_OK != sqlite3_reset (stmt)) | 1095 | if (SQLITE_OK != sqlite3_reset (stmt)) |
1088 | LOG_SQLITE (plugin, NULL, | 1096 | LOG_SQLITE (plugin, |
1089 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1097 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1090 | "sqlite3_reset"); | 1098 | "sqlite3_reset"); |
1091 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 1099 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
@@ -1115,7 +1123,7 @@ sqlite_plugin_get_keys (void *cls, | |||
1115 | GNUNET_assert (proc != NULL); | 1123 | GNUNET_assert (proc != NULL); |
1116 | if (sq_prepare (plugin->dbh, "SELECT hash FROM gn090", &stmt) != SQLITE_OK) | 1124 | if (sq_prepare (plugin->dbh, "SELECT hash FROM gn090", &stmt) != SQLITE_OK) |
1117 | { | 1125 | { |
1118 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1126 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1119 | "sqlite_prepare"); | 1127 | "sqlite_prepare"); |
1120 | proc (proc_cls, NULL, 0); | 1128 | proc (proc_cls, NULL, 0); |
1121 | return; | 1129 | return; |
@@ -1129,7 +1137,7 @@ sqlite_plugin_get_keys (void *cls, | |||
1129 | GNUNET_break (0); | 1137 | GNUNET_break (0); |
1130 | } | 1138 | } |
1131 | if (SQLITE_DONE != ret) | 1139 | if (SQLITE_DONE != ret) |
1132 | LOG_SQLITE (plugin, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite_step"); | 1140 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite_step"); |
1133 | sqlite3_finalize (stmt); | 1141 | sqlite3_finalize (stmt); |
1134 | proc (proc_cls, NULL, 0); | 1142 | proc (proc_cls, NULL, 0); |
1135 | } | 1143 | } |