diff options
Diffstat (limited to 'src/namestore/plugin_namestore_sqlite.c')
-rw-r--r-- | src/namestore/plugin_namestore_sqlite.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index 6c76d12e9..6ee3de495 100644 --- a/src/namestore/plugin_namestore_sqlite.c +++ b/src/namestore/plugin_namestore_sqlite.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * This file is part of GNUnet | 2 | * This file is part of GNUnet |
3 | * (C) 2009, 2011, 2012 Christian Grothoff (and other contributing authors) | 3 | * (C) 2009-2013 Christian Grothoff (and other contributing authors) |
4 | * | 4 | * |
5 | * GNUnet is free software; you can redistribute it and/or modify | 5 | * GNUnet is free software; you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published | 6 | * it under the terms of the GNU General Public License as published |
@@ -450,7 +450,7 @@ namestore_sqlite_remove_records (void *cls, | |||
450 | */ | 450 | */ |
451 | static int | 451 | static int |
452 | namestore_sqlite_put_records (void *cls, | 452 | namestore_sqlite_put_records (void *cls, |
453 | const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key, | 453 | const struct GNUNET_CRYPTO_EccPublicKey *zone_key, |
454 | struct GNUNET_TIME_Absolute expire, | 454 | struct GNUNET_TIME_Absolute expire, |
455 | const char *name, | 455 | const char *name, |
456 | unsigned int rd_count, | 456 | unsigned int rd_count, |
@@ -467,7 +467,7 @@ namestore_sqlite_put_records (void *cls, | |||
467 | size_t data_size; | 467 | size_t data_size; |
468 | unsigned int i; | 468 | unsigned int i; |
469 | 469 | ||
470 | GNUNET_CRYPTO_short_hash (zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), &zone); | 470 | GNUNET_CRYPTO_short_hash (zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &zone); |
471 | (void) namestore_sqlite_remove_records (plugin, &zone, name); | 471 | (void) namestore_sqlite_remove_records (plugin, &zone, name); |
472 | name_len = strlen (name); | 472 | name_len = strlen (name); |
473 | GNUNET_CRYPTO_short_hash (name, name_len, &nh); | 473 | GNUNET_CRYPTO_short_hash (name, name_len, &nh); |
@@ -497,7 +497,7 @@ namestore_sqlite_put_records (void *cls, | |||
497 | GNUNET_break (0); | 497 | GNUNET_break (0); |
498 | return GNUNET_SYSERR; | 498 | return GNUNET_SYSERR; |
499 | } | 499 | } |
500 | if ((SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 1, zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), SQLITE_STATIC)) || | 500 | if ((SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 1, zone_key, sizeof (struct GNUNET_CRYPTO_EccPublicKey), SQLITE_STATIC)) || |
501 | (SQLITE_OK != sqlite3_bind_text (plugin->put_records, 2, name, -1, SQLITE_STATIC)) || | 501 | (SQLITE_OK != sqlite3_bind_text (plugin->put_records, 2, name, -1, SQLITE_STATIC)) || |
502 | (SQLITE_OK != sqlite3_bind_int (plugin->put_records, 3, rd_count)) || | 502 | (SQLITE_OK != sqlite3_bind_int (plugin->put_records, 3, rd_count)) || |
503 | (SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 4, data, data_size, SQLITE_STATIC)) || | 503 | (SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 4, data, data_size, SQLITE_STATIC)) || |
@@ -560,7 +560,7 @@ get_record_and_call_iterator (struct Plugin *plugin, | |||
560 | int sret; | 560 | int sret; |
561 | unsigned int record_count; | 561 | unsigned int record_count; |
562 | size_t data_size; | 562 | size_t data_size; |
563 | const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key; | 563 | const struct GNUNET_CRYPTO_EccPublicKey *zone_key; |
564 | const struct GNUNET_CRYPTO_EccSignature *sig; | 564 | const struct GNUNET_CRYPTO_EccSignature *sig; |
565 | struct GNUNET_TIME_Absolute expiration; | 565 | struct GNUNET_TIME_Absolute expiration; |
566 | const char *data; | 566 | const char *data; |
@@ -578,7 +578,7 @@ get_record_and_call_iterator (struct Plugin *plugin, | |||
578 | expiration.abs_value = (uint64_t) sqlite3_column_int64 (stmt, 4); | 578 | expiration.abs_value = (uint64_t) sqlite3_column_int64 (stmt, 4); |
579 | sig = sqlite3_column_blob (stmt, 5); | 579 | sig = sqlite3_column_blob (stmt, 5); |
580 | 580 | ||
581 | if ( (sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded) != sqlite3_column_bytes (stmt, 0)) || | 581 | if ( (sizeof (struct GNUNET_CRYPTO_EccPublicKey) != sqlite3_column_bytes (stmt, 0)) || |
582 | (sizeof (struct GNUNET_CRYPTO_EccSignature) != sqlite3_column_bytes (stmt, 5)) ) | 582 | (sizeof (struct GNUNET_CRYPTO_EccSignature) != sqlite3_column_bytes (stmt, 5)) ) |
583 | { | 583 | { |
584 | GNUNET_break (0); | 584 | GNUNET_break (0); |