From 8a929c8668a467360463d4346332ffe492fab110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sun, 20 May 2018 16:20:43 +0200 Subject: [PATCH] core: fix code style in function hashtable_add_from_infolist --- src/core/wee-hashtable.c | 24 ++++++++++++++++-------- src/core/wee-hashtable.h | 2 +- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/core/wee-hashtable.c b/src/core/wee-hashtable.c index c1ea3b8b9..e22800615 100644 --- a/src/core/wee-hashtable.c +++ b/src/core/wee-hashtable.c @@ -1123,17 +1123,18 @@ hashtable_add_from_infolist (struct t_hashtable *hashtable, if (!hashtable || !infolist || !infolist->ptr_item || !prefix) return 0; + /* TODO: implement other key types */ if (hashtable->type_keys != HASHTABLE_STRING) return 0; - /* TODO: implement other key types */ - snprintf (prefix_name, sizeof (prefix_name), - "%s_name_", prefix); + snprintf (prefix_name, sizeof (prefix_name), "%s_name_", prefix); prefix_length = strlen (prefix_name); - for (ptr_name = infolist->ptr_item->vars; ptr_name; ptr_name = ptr_name->next_var) + for (ptr_name = infolist->ptr_item->vars; ptr_name; + ptr_name = ptr_name->next_var) { - if (string_strncasecmp (ptr_name->name, prefix_name, prefix_length) == 0) + if (string_strncasecmp (ptr_name->name, prefix_name, + prefix_length) == 0) { snprintf (option_value, sizeof (option_value), "%s_value_%s", prefix, ptr_name->name + prefix_length); @@ -1168,11 +1169,18 @@ hashtable_add_from_infolist (struct t_hashtable *hashtable, } if (hashtable->type_values == HASHTABLE_BUFFER) { - hashtable_set_with_size (hashtable, ptr_name->value, 0, - ptr_value->value, ptr_value->size); + hashtable_set_with_size (hashtable, + ptr_name->value, + 0, + ptr_value->value, + ptr_value->size); } else - hashtable_set (hashtable, ptr_name->value, ptr_value->value); + { + hashtable_set (hashtable, + ptr_name->value, + ptr_value->value); + } } } } diff --git a/src/core/wee-hashtable.h b/src/core/wee-hashtable.h index 6733d76c0..b611a51a9 100644 --- a/src/core/wee-hashtable.h +++ b/src/core/wee-hashtable.h @@ -21,8 +21,8 @@ #define WEECHAT_HASHTABLE_H struct t_hashtable; -struct t_infolist_item; struct t_infolist; +struct t_infolist_item; typedef unsigned long long (t_hashtable_hash_key)(struct t_hashtable *hashtable, const void *key);