access config via a pointer, not a hardcoded struct address

this is required so we can elegantly swap out an old config for a
new one in the future and remove lots of boilerplate from config
initialization code.

unfortunately this is a quite intrusive change as the config struct
was accessed in numerous places, but frankly it should have been
done via a pointer right from the start.

right now, we simply point to a static struct in main.c, so there
shouldn't be any noticeable changes in behaviour.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/html-error.c b/src/html-error.c
index 2b15c08..3018b46 100644
--- a/src/html-error.c
+++ b/src/html-error.c
@@ -41,13 +41,13 @@ int add_new_errorpage (char *filepath, unsigned int errornum)
 {
         char errornbuf[ERRORNUM_BUFSIZE];
 
-        config.errorpages = hashmap_create (ERRPAGES_BUCKETCOUNT);
-        if (!config.errorpages)
+        config->errorpages = hashmap_create (ERRPAGES_BUCKETCOUNT);
+        if (!config->errorpages)
                 return (-1);
 
         snprintf (errornbuf, ERRORNUM_BUFSIZE, "%u", errornum);
 
-        if (hashmap_insert (config.errorpages, errornbuf,
+        if (hashmap_insert (config->errorpages, errornbuf,
                             filepath, strlen (filepath) + 1) < 0)
                 return (-1);
 
@@ -66,19 +66,19 @@ static char *get_html_file (unsigned int errornum)
 
         assert (errornum >= 100 && errornum < 1000);
 
-        if (!config.errorpages)
-                return (config.errorpage_undef);
+        if (!config->errorpages)
+                return (config->errorpage_undef);
 
         snprintf (errornbuf, ERRORNUM_BUFSIZE, "%u", errornum);
 
-        result_iter = hashmap_find (config.errorpages, errornbuf);
+        result_iter = hashmap_find (config->errorpages, errornbuf);
 
-        if (hashmap_is_end (config.errorpages, result_iter))
-                return (config.errorpage_undef);
+        if (hashmap_is_end (config->errorpages, result_iter))
+                return (config->errorpage_undef);
 
-        if (hashmap_return_entry (config.errorpages, result_iter,
+        if (hashmap_return_entry (config->errorpages, result_iter,
                                   &key, (void **) &val) < 0)
-                return (config.errorpage_undef);
+                return (config->errorpage_undef);
 
         return (val);
 }