diff options
| author | Christian Grothoff <christian@grothoff.org> | 2018-05-02 17:27:16 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2018-05-02 17:27:42 +0200 |
| commit | 32cc463b677a8bc46b61111fe1bbc38554cb2ca0 (patch) | |
| tree | 1b25275e2526c733d6fa21e3a0466a700e13b9fa | |
| parent | b91002ea10d9770da6b2d97edf28e896c01e0edf (diff) | |
fix scanf calls
| -rw-r--r-- | src/namestore/plugin_namestore_flat.c | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/src/namestore/plugin_namestore_flat.c b/src/namestore/plugin_namestore_flat.c index 88b3ce9b4a..bbb9e3c628 100644 --- a/src/namestore/plugin_namestore_flat.c +++ b/src/namestore/plugin_namestore_flat.c @@ -140,7 +140,7 @@ database_setup (struct Plugin *plugin) char *rvalue; char *record_count; size_t record_data_size; - size_t size; + uint64_t size; size_t key_len; struct GNUNET_HashCode hkey; struct GNUNET_DISK_FileHandle *fh; @@ -218,7 +218,8 @@ database_setup (struct Plugin *plugin) if (0 < size) { line = strtok (buffer, "\n"); - while (line != NULL) { + while (line != NULL) + { zone_private_key = strtok (line, ","); if (NULL == zone_private_key) break; @@ -236,23 +237,33 @@ database_setup (struct Plugin *plugin) break; line = strtok (NULL, "\n"); entry = GNUNET_new (struct FlatFileEntry); - if (1 != sscanf (rvalue, - "%lu", - &entry->rvalue)) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Error parsing entry\n"); - GNUNET_free (entry); - break; + unsigned long long ll; + + if (1 != sscanf (rvalue, + "%llu", + &ll)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Error parsing entry\n"); + GNUNET_free (entry); + break; + } + entry->rvalue = (uint64_t) ll; } - if (1 != sscanf (record_count, - "%u", - &entry->record_count)) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Error parsing entry\n"); - GNUNET_free (entry); - break; + unsigned int ui; + + if (1 != sscanf (record_count, + "%u", + &ui)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Error parsing entry\n"); + GNUNET_free (entry); + break; + } + entry->record_count = (uint32_t) ui; } entry->label = GNUNET_strdup (label); record_data_size |