From: Mark Wielaard <mark@klomp.org>
Date: Thu, 22 Jun 2023 12:45:56 +0000 (+0200)
Subject: debuginfod: Fix formatting in debuginfod_config_cache
X-Git-Tag: elfutils-0.190~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b66b5301ba9268ee28e692313959c6f0f0e1b7a;p=thirdparty%2Felfutils.git

debuginfod: Fix formatting in debuginfod_config_cache

The formatting of debuginfod_config_cache in debuginfod-client.c was
slightly off making it hard to see the program logic. Make sure lines
are < 76 chars, and if { } else { } indentation follows GNU style.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---

diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
index cb28f1d07..d92d8d62c 100644
--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
@@ -277,23 +277,27 @@ debuginfod_config_cache(debuginfod_client *c, char *config_path,
     }
 
   long cache_config;
-  /* PR29696 - NB: When using fdopen, the file descriptor is NOT dup'ed and will
-  be closed when the stream is closed. Manually closing fd after fclose
-  is called will lead to a race condition where, if reused, the file descriptor will
-  compete for its regular use before being incorrectly closed here.
-  */
+  /* PR29696 - NB: When using fdopen, the file descriptor is NOT
+     dup'ed and will be closed when the stream is closed. Manually
+     closing fd after fclose is called will lead to a race condition
+     where, if reused, the file descriptor will compete for its
+     regular use before being incorrectly closed here.  */
   FILE *config_file = fdopen(fd, "r");
   if (config_file)
-  {
-    if (fscanf(config_file, "%ld", &cache_config) != 1)
+    {
+      if (fscanf(config_file, "%ld", &cache_config) != 1)
+	cache_config = cache_config_default_s;
+      if (0 != fclose (config_file) && c->verbose_fd >= 0)
+	dprintf (c->verbose_fd, "fclose failed with %s (err=%d)\n",
+		 strerror (errno), errno);
+    }
+  else
+    {
       cache_config = cache_config_default_s;
-    if(0 != fclose(config_file) && c->verbose_fd >= 0)
-      dprintf (c->verbose_fd, "fclose failed with %s (err=%d)\n", strerror (errno), errno);
-  }else{
-    cache_config = cache_config_default_s;
-    if(0 != close(fd) && c->verbose_fd >= 0)
-      dprintf (c->verbose_fd, "close failed with %s (err=%d)\n", strerror (errno), errno);
-  }
+      if (0 != close (fd) && c->verbose_fd >= 0)
+	dprintf (c->verbose_fd, "close failed with %s (err=%d)\n",
+		 strerror (errno), errno);
+    }
   return cache_config;
 }