From 66848756c0b1f6a9b77da3911227556eb7440719 Mon Sep 17 00:00:00 2001
From: Alex 'AdUser' Z <ad_user@runbox.com>
Date: Fri, 11 Mar 2016 20:46:41 +1000
Subject: [PATCH] * config.[ch]: f2b_config_section_append() ->
 f2b_config_param_append()

---
 src/config.c | 53 +++++++++++++++++++++++++---------------------------
 src/config.h |  2 +-
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/config.c b/src/config.c
index 2de625d..76df313 100644
--- a/src/config.c
+++ b/src/config.c
@@ -73,6 +73,29 @@ f2b_config_param_find(f2b_config_param_t *param, const char *name) {
   return NULL;
 }
 
+f2b_config_param_t *
+f2b_config_param_append(f2b_config_param_t *list, f2b_config_param_t *param, bool replace) {
+  f2b_config_param_t *p;
+
+  assert(param != NULL);
+
+  if (!list)
+    return param; /* no parameters yet */
+
+  if (replace && (p = f2b_config_param_find(list, param->name)) != NULL) {
+    /* found param with same name */
+    strncpy(p->value, param->value, sizeof(p->value));
+    free(param);
+    return list;
+  }
+
+  for (p = list; p->next != NULL; p = p->next)
+    /* find last element */;
+
+  p->next = param;
+  return list;
+}
+
 f2b_config_section_t *
 f2b_config_section_create(const char *src) {
   f2b_config_section_t *section = NULL;
@@ -140,32 +163,6 @@ f2b_config_section_find(f2b_config_section_t *section, const char *name) {
   return NULL;
 }
 
-f2b_config_section_t *
-f2b_config_section_append(f2b_config_section_t *section, f2b_config_param_t *param, bool replace) {
-  f2b_config_param_t *prev = NULL;
-
-  assert(section != NULL);
-  assert(param != NULL);
-
-  if (!section->param) {
-    /* no parameters yet */
-    section->param = param;
-    section->last  = param;
-    return section;
-  }
-
-  if (replace && (prev = f2b_config_param_find(section->param, param->name)) != NULL) {
-    /* found param with same name */
-    strncpy(prev->value, param->value, sizeof(prev->value));
-    free(param);
-    return section;
-  }
-
-  section->last->next = param;
-  section->last = param;
-  return section;
-}
-
 bool
 f2b_config_load(f2b_config_t *config, const char *path) {
   f2b_config_section_t *section = NULL; /* always points to current section */
@@ -224,9 +221,9 @@ f2b_config_load(f2b_config_t *config, const char *path) {
         /* key/value pair */
         param = f2b_config_param_create(p);
         if (param && (section->type == t_main || section->type == t_defaults)) {
-          f2b_config_section_append(section, param, true);
+          section->param = f2b_config_param_append(section->param, param, true);
         } else if (param) {
-          f2b_config_section_append(section, param, false);
+          section->param = f2b_config_param_append(section->param, param, false);
         } else {
           f2b_log_msg(log_error, "can't parse key/value at line %d: %s", linenum, p);
           continue;
diff --git a/src/config.h b/src/config.h
index 06f7c1f..de67b38 100644
--- a/src/config.h
+++ b/src/config.h
@@ -39,10 +39,10 @@ typedef struct f2b_config_t {
 
 f2b_config_param_t * f2b_config_param_create(const char *line);
 f2b_config_param_t * f2b_config_param_find  (f2b_config_param_t *param, const char *name);
+f2b_config_param_t * f2b_config_param_append(f2b_config_param_t *list, f2b_config_param_t *p, bool replace);
 
 f2b_config_section_t * f2b_config_section_create(const char *line);
 f2b_config_section_t * f2b_config_section_find  (f2b_config_section_t *s, const char *name);
-f2b_config_section_t * f2b_config_section_append(f2b_config_section_t *s, f2b_config_param_t *p, bool replace);
 
 bool                   f2b_config_load  (f2b_config_t *c, const char *path);
 void                   f2b_config_free  (f2b_config_t *c);