[v2,2/3] qemu-bridge-helper: move repeating code in parse_acl_file

Commit Message

Prasad Pandit July 1, 2019, 9:09 a.m. UTC

From: Prasad J Pandit <[e-mail]>

Move repeating error handling sequence in parse_acl_file routine
to an 'err' label.

Signed-off-by: Prasad J Pandit <[e-mail]>
---
 qemu-bridge-helper.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

Comments

Daniel P. Berrangé July 1, 2019, 9:44 a.m. UTC | #1

On Mon, Jul 01, 2019 at 02:39:03PM +0530, P J P wrote:
> From: Prasad J Pandit <[e-mail]>
> 
> Move repeating error handling sequence in parse_acl_file routine
> to an 'err' label.
> 
> Signed-off-by: Prasad J Pandit <[e-mail]>
> ---
>  qemu-bridge-helper.c | 18 ++++++++----------
>  1 file changed, 8 insertions(+), 10 deletions(-)

Reviewed-by: Daniel P. Berrangé <[e-mail]>


Regards,
Daniel

Patch

diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
index 8ec0a65174..da647de38f 100644
--- a/qemu-bridge-helper.c
+++ b/qemu-bridge-helper.c
@@ -92,9 +92,7 @@  static int parse_acl_file(const char *filename, ACLList *acl_list)
 
         if (arg == NULL) {
             fprintf(stderr, "Invalid config line:\n  %s\n", line);
-            fclose(f);
-            errno = EINVAL;
-            return -1;
+            goto err;
         }
 
         *arg = 0;
@@ -111,9 +109,7 @@  static int parse_acl_file(const char *filename, ACLList *acl_list)
 
         if (strcmp(cmd, "include") && strlen(arg) >= IFNAMSIZ) {
             fprintf(stderr, "name `%s' too long: %lu\n", arg, strlen(arg));
-            fclose(f);
-            errno = EINVAL;
-            return -1;
+            goto err;
         }
 
         if (strcmp(cmd, "deny") == 0) {
@@ -139,15 +135,17 @@  static int parse_acl_file(const char *filename, ACLList *acl_list)
             parse_acl_file(arg, acl_list);
         } else {
             fprintf(stderr, "Unknown command `%s'\n", cmd);
-            fclose(f);
-            errno = EINVAL;
-            return -1;
+            goto err;
         }
     }
 
     fclose(f);
-
     return 0;
+
+err:
+    fclose(f);
+    errno = EINVAL;
+    return -1;
 }
 
 static bool has_vnet_hdr(int fd)