From 38c845f50a35ef28b9c156c9790ea67df01da3f4 Mon Sep 17 00:00:00 2001
From: Christer Ekholm <christer.ekholm@cn.abb.com>
Date: Thu, 18 Jan 2024 13:35:16 +0800
Subject: [PATCH] clean merge conflicts dirtiness

---
 include/cargs.h    | 4 ++--
 src/cargs.c        | 1 -
 test/option_test.c | 4 +++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/cargs.h b/include/cargs.h
index 24bbf61..0a35b88 100644
--- a/include/cargs.h
+++ b/include/cargs.h
@@ -251,8 +251,8 @@ CAG_PUBLIC void cag_option_print(const cag_option *options, size_t option_count,
   * @param printer_ctx The parameter for printer callback. For example fprint
   * could use parameter stderr.
   */
- CAG_PUBLIC void cag_option_printer(const cag_option *options,
-   size_t option_count, cag_printer printer, void *printer_ctx);
+CAG_PUBLIC void cag_option_printer(const cag_option *options,
+  size_t option_count, cag_printer printer, void *printer_ctx);
 
 CAG_DEPRECATED(
   "cag_option_prepare has been deprecated. Use cag_option_init instead.")
diff --git a/src/cargs.c b/src/cargs.c
index 3e1ef9a..68553da 100644
--- a/src/cargs.c
+++ b/src/cargs.c
@@ -77,7 +77,6 @@ static size_t cag_option_get_print_indention(const cag_option *options,
   return result;
 }
 
-
 void cag_option_init(cag_option_context *context, const cag_option *options,
   size_t option_count, int argc, char **argv)
 {
diff --git a/test/option_test.c b/test/option_test.c
index ab9c884..b96643a 100755
--- a/test/option_test.c
+++ b/test/option_test.c
@@ -912,12 +912,14 @@ int option_error_print_short(void)
     goto err_test;
   }
 
+  destroy_args();
   fclose(test_file);
   return EXIT_SUCCESS;
 
 err_test:
 err_read:
 err_seek:
+  destroy_args();
 err_setup:
   fclose(test_file);
 err_open:
@@ -973,4 +975,4 @@ int option_error_print_long(void)
   fclose(test_file);
 err_open:
   return EXIT_FAILURE;
-}
\ No newline at end of file
+}