From c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 5 Oct 2019 15:09:28 +0200 Subject: global reindent, now with uncrustify hook enabled --- src/peerstore/plugin_peerstore_flat.c | 509 +++++++++++++++++----------------- 1 file changed, 255 insertions(+), 254 deletions(-) (limited to 'src/peerstore/plugin_peerstore_flat.c') diff --git a/src/peerstore/plugin_peerstore_flat.c b/src/peerstore/plugin_peerstore_flat.c index 749e270e4..224664685 100644 --- a/src/peerstore/plugin_peerstore_flat.c +++ b/src/peerstore/plugin_peerstore_flat.c @@ -32,7 +32,8 @@ /** * Context for all functions in this plugin. */ -struct Plugin { +struct Plugin +{ /** * Configuration handle */ @@ -96,23 +97,23 @@ struct Plugin { static int -delete_entries(void *cls, - const struct GNUNET_HashCode *key, - void *value) +delete_entries (void *cls, + const struct GNUNET_HashCode *key, + void *value) { struct Plugin *plugin = cls; struct GNUNET_PEERSTORE_Record *entry = value; - if (0 != strcmp(plugin->iter_key, entry->key)) + if (0 != strcmp (plugin->iter_key, entry->key)) return GNUNET_YES; - if (0 != memcmp(plugin->iter_peer, - &entry->peer, - sizeof(struct GNUNET_PeerIdentity))) + if (0 != memcmp (plugin->iter_peer, + &entry->peer, + sizeof(struct GNUNET_PeerIdentity))) return GNUNET_YES; - if (0 != strcmp(plugin->iter_sub_system, entry->sub_system)) + if (0 != strcmp (plugin->iter_sub_system, entry->sub_system)) return GNUNET_YES; - GNUNET_CONTAINER_multihashmap_remove(plugin->hm, key, value); + GNUNET_CONTAINER_multihashmap_remove (plugin->hm, key, value); plugin->deleted_entries++; return GNUNET_YES; } @@ -128,9 +129,9 @@ delete_entries(void *cls, * @return number of deleted records */ static int -peerstore_flat_delete_records(void *cls, const char *sub_system, - const struct GNUNET_PeerIdentity *peer, - const char *key) +peerstore_flat_delete_records (void *cls, const char *sub_system, + const struct GNUNET_PeerIdentity *peer, + const char *key) { struct Plugin *plugin = cls; @@ -139,25 +140,25 @@ peerstore_flat_delete_records(void *cls, const char *sub_system, plugin->iter_key = key; plugin->deleted_entries = 0; - GNUNET_CONTAINER_multihashmap_iterate(plugin->hm, - &delete_entries, - plugin); + GNUNET_CONTAINER_multihashmap_iterate (plugin->hm, + &delete_entries, + plugin); return plugin->deleted_entries; } static int -expire_entries(void *cls, - const struct GNUNET_HashCode *key, - void *value) +expire_entries (void *cls, + const struct GNUNET_HashCode *key, + void *value) { struct Plugin *plugin = cls; struct GNUNET_PEERSTORE_Record *entry = value; if (entry->expiry.abs_value_us < plugin->iter_now.abs_value_us) - { - GNUNET_CONTAINER_multihashmap_remove(plugin->hm, key, value); - plugin->exp_changes++; - } + { + GNUNET_CONTAINER_multihashmap_remove (plugin->hm, key, value); + plugin->exp_changes++; + } return GNUNET_YES; } @@ -174,49 +175,49 @@ expire_entries(void *cls, * called */ static int -peerstore_flat_expire_records(void *cls, struct GNUNET_TIME_Absolute now, - GNUNET_PEERSTORE_Continuation cont, - void *cont_cls) +peerstore_flat_expire_records (void *cls, struct GNUNET_TIME_Absolute now, + GNUNET_PEERSTORE_Continuation cont, + void *cont_cls) { struct Plugin *plugin = cls; plugin->exp_changes = 0; plugin->iter_now = now; - GNUNET_CONTAINER_multihashmap_iterate(plugin->hm, - &expire_entries, - plugin); + GNUNET_CONTAINER_multihashmap_iterate (plugin->hm, + &expire_entries, + plugin); if (NULL != cont) - { - cont(cont_cls, plugin->exp_changes); - } + { + cont (cont_cls, plugin->exp_changes); + } return GNUNET_OK; } static int -iterate_entries(void *cls, - const struct GNUNET_HashCode *key, - void *value) +iterate_entries (void *cls, + const struct GNUNET_HashCode *key, + void *value) { struct Plugin *plugin = cls; struct GNUNET_PEERSTORE_Record *entry = value; if ((NULL != plugin->iter_peer) && - (0 != memcmp(plugin->iter_peer, - &entry->peer, - sizeof(struct GNUNET_PeerIdentity)))) - { - return GNUNET_YES; - } + (0 != memcmp (plugin->iter_peer, + &entry->peer, + sizeof(struct GNUNET_PeerIdentity)))) + { + return GNUNET_YES; + } if ((NULL != plugin->iter_key) && - (0 != strcmp(plugin->iter_key, - entry->key))) - { - return GNUNET_YES; - } + (0 != strcmp (plugin->iter_key, + entry->key))) + { + return GNUNET_YES; + } if (NULL != plugin->iter) - plugin->iter(plugin->iter_cls, entry, NULL); + plugin->iter (plugin->iter_cls, entry, NULL); plugin->iter_result_found = GNUNET_YES; return GNUNET_YES; } @@ -236,11 +237,11 @@ iterate_entries(void *cls, * called */ static int -peerstore_flat_iterate_records(void *cls, const char *sub_system, - const struct GNUNET_PeerIdentity *peer, - const char *key, - GNUNET_PEERSTORE_Processor iter, - void *iter_cls) +peerstore_flat_iterate_records (void *cls, const char *sub_system, + const struct GNUNET_PeerIdentity *peer, + const char *key, + GNUNET_PEERSTORE_Processor iter, + void *iter_cls) { struct Plugin *plugin = cls; @@ -250,11 +251,11 @@ peerstore_flat_iterate_records(void *cls, const char *sub_system, plugin->iter_sub_system = sub_system; plugin->iter_key = key; - GNUNET_CONTAINER_multihashmap_iterate(plugin->hm, - &iterate_entries, - plugin); + GNUNET_CONTAINER_multihashmap_iterate (plugin->hm, + &iterate_entries, + plugin); if (NULL != iter) - iter(iter_cls, NULL, NULL); + iter (iter_cls, NULL, NULL); return GNUNET_OK; } @@ -277,13 +278,13 @@ peerstore_flat_iterate_records(void *cls, const char *sub_system, * @return #GNUNET_OK on success, else #GNUNET_SYSERR and cont is not called */ static int -peerstore_flat_store_record(void *cls, const char *sub_system, - const struct GNUNET_PeerIdentity *peer, - const char *key, const void *value, size_t size, - struct GNUNET_TIME_Absolute expiry, - enum GNUNET_PEERSTORE_StoreOption options, - GNUNET_PEERSTORE_Continuation cont, - void *cont_cls) +peerstore_flat_store_record (void *cls, const char *sub_system, + const struct GNUNET_PeerIdentity *peer, + const char *key, const void *value, size_t size, + struct GNUNET_TIME_Absolute expiry, + enum GNUNET_PEERSTORE_StoreOption options, + GNUNET_PEERSTORE_Continuation cont, + void *cont_cls) { struct Plugin *plugin = cls; struct GNUNET_HashCode hkey; @@ -291,33 +292,33 @@ peerstore_flat_store_record(void *cls, const char *sub_system, const char *peer_id; - entry = GNUNET_new(struct GNUNET_PEERSTORE_Record); - entry->sub_system = GNUNET_strdup(sub_system); - entry->key = GNUNET_strdup(key); - entry->value = GNUNET_malloc(size); - GNUNET_memcpy(entry->value, value, size); + entry = GNUNET_new (struct GNUNET_PEERSTORE_Record); + entry->sub_system = GNUNET_strdup (sub_system); + entry->key = GNUNET_strdup (key); + entry->value = GNUNET_malloc (size); + GNUNET_memcpy (entry->value, value, size); entry->value_size = size; entry->peer = *peer; entry->expiry = expiry; - peer_id = GNUNET_i2s(peer); - GNUNET_CRYPTO_hash(peer_id, - strlen(peer_id), - &hkey); + peer_id = GNUNET_i2s (peer); + GNUNET_CRYPTO_hash (peer_id, + strlen (peer_id), + &hkey); if (GNUNET_PEERSTORE_STOREOPTION_REPLACE == options) - { - peerstore_flat_delete_records(cls, sub_system, peer, key); - } - - GNUNET_CONTAINER_multihashmap_put(plugin->hm, - &hkey, - entry, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); + { + peerstore_flat_delete_records (cls, sub_system, peer, key); + } + + GNUNET_CONTAINER_multihashmap_put (plugin->hm, + &hkey, + entry, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); if (NULL != cont) - { - cont(cont_cls, GNUNET_OK); - } + { + cont (cont_cls, GNUNET_OK); + } return GNUNET_OK; } @@ -331,7 +332,7 @@ peerstore_flat_store_record(void *cls, const char *sub_system, * @return GNUNET_OK on success */ static int -database_setup(struct Plugin *plugin) +database_setup (struct Plugin *plugin) { char *afsdir; char *key; @@ -348,139 +349,139 @@ database_setup(struct Plugin *plugin) char *line; if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_filename(plugin->cfg, "peerstore-flat", - "FILENAME", &afsdir)) + GNUNET_CONFIGURATION_get_value_filename (plugin->cfg, "peerstore-flat", + "FILENAME", &afsdir)) + { + GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "peerstore-flat", + "FILENAME"); + return GNUNET_SYSERR; + } + if (GNUNET_OK != GNUNET_DISK_file_test (afsdir)) + { + if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (afsdir)) { - GNUNET_log_config_missing(GNUNET_ERROR_TYPE_ERROR, "peerstore-flat", - "FILENAME"); + GNUNET_break (0); + GNUNET_free (afsdir); return GNUNET_SYSERR; } - if (GNUNET_OK != GNUNET_DISK_file_test(afsdir)) - { - if (GNUNET_OK != GNUNET_DISK_directory_create_for_file(afsdir)) - { - GNUNET_break(0); - GNUNET_free(afsdir); - return GNUNET_SYSERR; - } - } + } /* afsdir should be UTF-8-encoded. If it isn't, it's a bug */ plugin->fn = afsdir; - fh = GNUNET_DISK_file_open(afsdir, - GNUNET_DISK_OPEN_CREATE | - GNUNET_DISK_OPEN_READWRITE, - GNUNET_DISK_PERM_USER_WRITE | - GNUNET_DISK_PERM_USER_READ); + fh = GNUNET_DISK_file_open (afsdir, + GNUNET_DISK_OPEN_CREATE + | GNUNET_DISK_OPEN_READWRITE, + GNUNET_DISK_PERM_USER_WRITE + | GNUNET_DISK_PERM_USER_READ); if (NULL == fh) - { - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, - _("Unable to initialize file: %s.\n"), - afsdir); - return GNUNET_SYSERR; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _ ("Unable to initialize file: %s.\n"), + afsdir); + return GNUNET_SYSERR; + } /* Load data from file into hashmap */ - plugin->hm = GNUNET_CONTAINER_multihashmap_create(10, - GNUNET_NO); - - if (GNUNET_SYSERR == GNUNET_DISK_file_size(afsdir, - &size, - GNUNET_YES, - GNUNET_YES)) - { - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, - _("Unable to get filesize: %s.\n"), - afsdir); - return GNUNET_SYSERR; - } - - buffer = GNUNET_malloc(size + 1); - - if (GNUNET_SYSERR == GNUNET_DISK_file_read(fh, - buffer, - size)) - { - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, - _("Unable to read file: %s.\n"), - afsdir); - GNUNET_DISK_file_close(fh); - GNUNET_free(buffer); - return GNUNET_SYSERR; - } + plugin->hm = GNUNET_CONTAINER_multihashmap_create (10, + GNUNET_NO); + + if (GNUNET_SYSERR == GNUNET_DISK_file_size (afsdir, + &size, + GNUNET_YES, + GNUNET_YES)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _ ("Unable to get filesize: %s.\n"), + afsdir); + return GNUNET_SYSERR; + } + + buffer = GNUNET_malloc (size + 1); + + if (GNUNET_SYSERR == GNUNET_DISK_file_read (fh, + buffer, + size)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _ ("Unable to read file: %s.\n"), + afsdir); + GNUNET_DISK_file_close (fh); + GNUNET_free (buffer); + return GNUNET_SYSERR; + } buffer[size] = '\0'; - GNUNET_DISK_file_close(fh); + GNUNET_DISK_file_close (fh); if (0 < size) + { + line = strtok (buffer, "\n"); + while (line != NULL) { - line = strtok(buffer, "\n"); - while (line != NULL) - { - sub_system = strtok(line, ","); - if (NULL == sub_system) - break; - peer = strtok(NULL, ","); - if (NULL == peer) - break; - key = strtok(NULL, ","); - if (NULL == key) - break; - value = strtok(NULL, ","); - if (NULL == value) - break; - expiry = strtok(NULL, ","); - if (NULL == expiry) - break; - entry = GNUNET_new(struct GNUNET_PEERSTORE_Record); - entry->sub_system = GNUNET_strdup(sub_system); - entry->key = GNUNET_strdup(key); - { - size_t s; - char *o; - - o = NULL; - s = GNUNET_STRINGS_base64_decode(peer, - strlen(peer), - (void**)&o); - if (sizeof(struct GNUNET_PeerIdentity) == s) - GNUNET_memcpy(&entry->peer, - o, - s); - else - GNUNET_break(0); - GNUNET_free_non_null(o); - } - entry->value_size = GNUNET_STRINGS_base64_decode(value, - strlen(value), - (void**)&entry->value); - if (GNUNET_SYSERR == - GNUNET_STRINGS_fancy_time_to_absolute(expiry, - &entry->expiry)) - { - GNUNET_free(entry->sub_system); - GNUNET_free(entry->key); - GNUNET_free(entry); - break; - } - peer_id = GNUNET_i2s(&entry->peer); - GNUNET_CRYPTO_hash(peer_id, - strlen(peer_id), - &hkey); - - GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(plugin->hm, - &hkey, - entry, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); - } + sub_system = strtok (line, ","); + if (NULL == sub_system) + break; + peer = strtok (NULL, ","); + if (NULL == peer) + break; + key = strtok (NULL, ","); + if (NULL == key) + break; + value = strtok (NULL, ","); + if (NULL == value) + break; + expiry = strtok (NULL, ","); + if (NULL == expiry) + break; + entry = GNUNET_new (struct GNUNET_PEERSTORE_Record); + entry->sub_system = GNUNET_strdup (sub_system); + entry->key = GNUNET_strdup (key); + { + size_t s; + char *o; + + o = NULL; + s = GNUNET_STRINGS_base64_decode (peer, + strlen (peer), + (void**) &o); + if (sizeof(struct GNUNET_PeerIdentity) == s) + GNUNET_memcpy (&entry->peer, + o, + s); + else + GNUNET_break (0); + GNUNET_free_non_null (o); + } + entry->value_size = GNUNET_STRINGS_base64_decode (value, + strlen (value), + (void**) &entry->value); + if (GNUNET_SYSERR == + GNUNET_STRINGS_fancy_time_to_absolute (expiry, + &entry->expiry)) + { + GNUNET_free (entry->sub_system); + GNUNET_free (entry->key); + GNUNET_free (entry); + break; + } + peer_id = GNUNET_i2s (&entry->peer); + GNUNET_CRYPTO_hash (peer_id, + strlen (peer_id), + &hkey); + + GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (plugin->hm, + &hkey, + entry, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); } - GNUNET_free(buffer); + } + GNUNET_free (buffer); return GNUNET_OK; } static int -store_and_free_entries(void *cls, - const struct GNUNET_HashCode *key, - void *value) +store_and_free_entries (void *cls, + const struct GNUNET_HashCode *key, + void *value) { struct GNUNET_DISK_FileHandle *fh = cls; struct GNUNET_PEERSTORE_Record *entry = value; @@ -489,30 +490,30 @@ store_and_free_entries(void *cls, const char *expiry; char *val; - GNUNET_STRINGS_base64_encode(entry->value, - entry->value_size, - &val); - expiry = GNUNET_STRINGS_absolute_time_to_string(entry->expiry); - GNUNET_STRINGS_base64_encode((char*)&entry->peer, - sizeof(struct GNUNET_PeerIdentity), - &peer); - GNUNET_asprintf(&line, - "%s,%s,%s,%s,%s", - entry->sub_system, - peer, - entry->key, - val, - expiry); - GNUNET_free(val); - GNUNET_free(peer); - GNUNET_DISK_file_write(fh, - line, - strlen(line)); - GNUNET_free(entry->sub_system); - GNUNET_free(entry->key); - GNUNET_free(entry->value); - GNUNET_free(entry); - GNUNET_free(line); + GNUNET_STRINGS_base64_encode (entry->value, + entry->value_size, + &val); + expiry = GNUNET_STRINGS_absolute_time_to_string (entry->expiry); + GNUNET_STRINGS_base64_encode ((char*) &entry->peer, + sizeof(struct GNUNET_PeerIdentity), + &peer); + GNUNET_asprintf (&line, + "%s,%s,%s,%s,%s", + entry->sub_system, + peer, + entry->key, + val, + expiry); + GNUNET_free (val); + GNUNET_free (peer); + GNUNET_DISK_file_write (fh, + line, + strlen (line)); + GNUNET_free (entry->sub_system); + GNUNET_free (entry->key); + GNUNET_free (entry->value); + GNUNET_free (entry); + GNUNET_free (line); return GNUNET_YES; } @@ -522,28 +523,28 @@ store_and_free_entries(void *cls, * @param plugin the plugin context (state for this module) */ static void -database_shutdown(struct Plugin *plugin) +database_shutdown (struct Plugin *plugin) { struct GNUNET_DISK_FileHandle *fh; - fh = GNUNET_DISK_file_open(plugin->fn, - GNUNET_DISK_OPEN_CREATE | - GNUNET_DISK_OPEN_TRUNCATE | - GNUNET_DISK_OPEN_READWRITE, - GNUNET_DISK_PERM_USER_WRITE | - GNUNET_DISK_PERM_USER_READ); + fh = GNUNET_DISK_file_open (plugin->fn, + GNUNET_DISK_OPEN_CREATE + | GNUNET_DISK_OPEN_TRUNCATE + | GNUNET_DISK_OPEN_READWRITE, + GNUNET_DISK_PERM_USER_WRITE + | GNUNET_DISK_PERM_USER_READ); if (NULL == fh) - { - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, - _("Unable to initialize file: %s.\n"), - plugin->fn); - return; - } - GNUNET_CONTAINER_multihashmap_iterate(plugin->hm, - &store_and_free_entries, - fh); - GNUNET_CONTAINER_multihashmap_destroy(plugin->hm); - GNUNET_DISK_file_close(fh); + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _ ("Unable to initialize file: %s.\n"), + plugin->fn); + return; + } + GNUNET_CONTAINER_multihashmap_iterate (plugin->hm, + &store_and_free_entries, + fh); + GNUNET_CONTAINER_multihashmap_destroy (plugin->hm); + GNUNET_DISK_file_close (fh); } @@ -554,7 +555,7 @@ database_shutdown(struct Plugin *plugin) * @return NULL on error, otherwise the plugin context */ void * -libgnunet_plugin_peerstore_flat_init(void *cls) +libgnunet_plugin_peerstore_flat_init (void *cls) { static struct Plugin plugin; const struct GNUNET_CONFIGURATION_Handle *cfg = cls; @@ -562,19 +563,19 @@ libgnunet_plugin_peerstore_flat_init(void *cls) if (NULL != plugin.cfg) return NULL; /* can only initialize once! */ - memset(&plugin, 0, sizeof(struct Plugin)); + memset (&plugin, 0, sizeof(struct Plugin)); plugin.cfg = cfg; - if (GNUNET_OK != database_setup(&plugin)) - { - database_shutdown(&plugin); - return NULL; - } - api = GNUNET_new(struct GNUNET_PEERSTORE_PluginFunctions); + if (GNUNET_OK != database_setup (&plugin)) + { + database_shutdown (&plugin); + return NULL; + } + api = GNUNET_new (struct GNUNET_PEERSTORE_PluginFunctions); api->cls = &plugin; api->store_record = &peerstore_flat_store_record; api->iterate_records = &peerstore_flat_iterate_records; api->expire_records = &peerstore_flat_expire_records; - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Flat plugin is running\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Flat plugin is running\n"); return api; } @@ -586,15 +587,15 @@ libgnunet_plugin_peerstore_flat_init(void *cls) * @return Always NULL */ void * -libgnunet_plugin_peerstore_flat_done(void *cls) +libgnunet_plugin_peerstore_flat_done (void *cls) { struct GNUNET_PEERSTORE_PluginFunctions *api = cls; struct Plugin *plugin = api->cls; - database_shutdown(plugin); + database_shutdown (plugin); plugin->cfg = NULL; - GNUNET_free(api); - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Flat plugin is finished\n"); + GNUNET_free (api); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Flat plugin is finished\n"); return NULL; } -- cgit v1.2.3