Move iniparser wrapper macros into its own atalk header

Author: rdmark

contrib/macipgw/main.c

@@ -34,6 +34,7 @@
 #include <atalk/ddp.h>
 #include <atalk/atp.h>
 #include <atalk/globals.h>
+#include <atalk/iniparser_util.h>
 
 #include <errno.h>
 #ifdef HAVE_INIPARSER_INIPARSER_H

etc/afpd/afp_config.c

@@ -38,6 +38,7 @@
 #include <atalk/ldapconfig.h>
 #endif
 
+#include <atalk/iniparser_util.h>
 #include <atalk/logger.h>
 #include <atalk/netatalk_conf.h>
 #include <atalk/server_child.h>

etc/afpd/spotlight.c

@@ -35,6 +35,7 @@
 #include <atalk/compat.h>
 #include <atalk/dalloc.h>
 #include <atalk/errchk.h>
+#include <atalk/iniparser_util.h>
 #include <atalk/list.h>
 #include <atalk/logger.h>
 #include <atalk/netatalk_conf.h>

etc/cnid_dbd/cnid_metad.c

@@ -84,6 +84,7 @@
 #include <atalk/cnid_bdb_private.h>
 #include <atalk/compat.h>
 #include <atalk/errchk.h>
+#include <atalk/iniparser_util.h>
 #include <atalk/netatalk_conf.h>
 #include <atalk/volume.h>
 

etc/netatalk/netatalk.c

@@ -37,6 +37,7 @@
 #include <atalk/dsi.h>
 #include <atalk/errchk.h>
 #include <atalk/globals.h>
+#include <atalk/iniparser_util.h>
 #include <atalk/logger.h>
 #include <atalk/netatalk_conf.h>
 #include <atalk/server_child.h>

include/atalk/globals.h

@@ -76,31 +76,6 @@
 
 #define IS_AFP_SESSION(obj) (((obj)->dsi && (obj)->dsi->serversock == -1) || ((obj)->Type))
 
-/**********************************************************************************************
- * Ini config manipulation macros
- **********************************************************************************************/
-
-#define INISEC_GLOBAL "global"
-#define INISEC_HOMES  "homes"
-
-#define INIPARSER_GETSTR(config, section, key, default) ({            \
-    char _option[MAXOPTLEN];                                          \
-    snprintf(_option, sizeof(_option), "%s:%s", section, key);        \
-    iniparser_getstring(config, _option, default);                    \
-})
-
-#define INIPARSER_GETSTRDUP(config, section, key, default) ({         \
-    char _option[MAXOPTLEN];                                          \
-    snprintf(_option, sizeof(_option), "%s:%s", section, key);        \
-    const char *_tmp = iniparser_getstring(config, _option, default); \
-    _tmp ? strdup(_tmp) : NULL;                                       \
-})
-
-#define CONFIG_ARG_FREE(a) do {                     \
-    free(a);                                        \
-    a = NULL;                                       \
-    } while (0);
-
 struct DSI;
 
 #define AFPOBJ_TMPSIZ (MAXPATHLEN)

include/atalk/iniparser_util.h

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2024-2025 Daniel Markstedt
+ * All Rights Reserved.  See COPYING.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef AFPD_INIPARSER_UTIL_H
+#define AFPD_INIPARSER_UTIL_H 1
+
+#ifdef HAVE_INIPARSER_INIPARSER_H
+#include <iniparser/iniparser.h>
+#else
+#include <iniparser.h>
+#endif
+
+/**********************************************************************************************
+ * Ini config manipulation macros
+ **********************************************************************************************/
+
+#define INISEC_GLOBAL "global"
+#define INISEC_HOMES  "homes"
+
+#define INIPARSER_GETSTR(config, section, key, default) ({            \
+    char _option[MAXOPTLEN];                                          \
+    snprintf(_option, sizeof(_option), "%s:%s", section, key);        \
+    iniparser_getstring(config, _option, default);                    \
+})
+
+#define INIPARSER_GETSTRDUP(config, section, key, default) ({         \
+    char _option[MAXOPTLEN];                                          \
+    snprintf(_option, sizeof(_option), "%s:%s", section, key);        \
+    const char *_tmp = iniparser_getstring(config, _option, default); \
+    _tmp ? strdup(_tmp) : NULL;                                       \
+})
+
+#define CONFIG_ARG_FREE(a) do {                     \
+    free(a);                                        \
+    a = NULL;                                       \
+    } while (0);
+
+#endif

include/atalk/meson.build

@@ -11,6 +11,7 @@ headers = [
     'ea.h',
     'globals.h',
     'hash.h',
+    'iniparser_util.h',
     'list.h',
     'logger.h',
     'netatalk_conf.h',

libatalk/acl/ldap_config.c

@@ -31,6 +31,7 @@
 #include <string.h>
 
 #include <atalk/globals.h>
+#include <atalk/iniparser_util.h>
 #include <atalk/ldapconfig.h>
 #include <atalk/logger.h>
 

libatalk/util/netatalk_conf.c

@@ -56,6 +56,7 @@
 #include <atalk/logger.h>
 #include <atalk/ea.h>
 #include <atalk/globals.h>
+#include <atalk/iniparser_util.h>
 #include <atalk/errchk.h>
 #include <atalk/unix.h>
 #include <atalk/cnid.h>