conf: reduce indentation in load_config_file()

This replaces a do { ... } while (0) with break statements
ba gotos. Imho, this is much clearer.

Michael

1 files changed, 14 insertions, 15 deletions

diff --git a/src/conf.c b/src/conf.c
index 26289ba..45f3126 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -389,24 +389,23 @@ static int load_config_file (const char *config_fname, struct config_s *conf)
         FILE *config_file;
         int ret = -1;
 
-        do {
-                config_file = fopen (config_fname, "r");
-                if (!config_file) {
-                        fprintf (stderr,
-                                 "%s: Could not open config file \"%s\".\n",
-                                 PACKAGE, config_fname);
-                        break;
-                }
+        config_file = fopen (config_fname, "r");
+        if (!config_file) {
+                fprintf (stderr,
+                         "%s: Could not open config file \"%s\".\n",
+                         PACKAGE, config_fname);
+                goto done;
+        }
 
-                if (config_compile () || config_parse (conf, config_file)) {
-                        fprintf (stderr, "Unable to parse config file. "
-                                 "Not starting.\n");
-                        break;
-                }
+        if (config_compile () || config_parse (conf, config_file)) {
+                fprintf (stderr, "Unable to parse config file. "
+                         "Not starting.\n");
+                goto done;
+        }
 
-                ret = 0;
-        } while (0);
+        ret = 0;
 
+done:
         if (config_file)
                 fclose (config_file);