diff mbox series

[4/4] Cleanup: simplify parser library API

Message ID 20240425124620.51594-4-stefano.babic@swupdate.org
State Accepted
Headers show
Series [1/4] Parser: statify get_value_* | expand

Commit Message

Stefano Babic April 25, 2024, 12:46 p.m. UTC 
Most of functions inside parselib.h are just used by the parselib
specific implementation and shouldn't be visible to the user of the
internal library, so move them to a private header file.

Signed-off-by: Stefano Babic <stefano.babic@swupdate.org>
---
 core/parsing_library.c              |  1 +
 corelib/parsing_library_libconfig.c |  1 +
 corelib/parsing_library_libjson.c   |  1 +
 include/parselib.h                  | 55 +++++++----------------------
 4 files changed, 16 insertions(+), 42 deletions(-)

--
2.34.1
diff mbox series

Patch

diff --git a/core/parsing_library.c b/core/parsing_library.c
index f852799e..a97f8114 100644
--- a/core/parsing_library.c
+++ b/core/parsing_library.c
@@ -18,6 +18,7 @@ 
 #include "bsdqueue.h"
 #include "util.h"
 #include "parselib.h"
+#include "parselib-private.h"

 #define MAX_LINKS_DEPTH	10

diff --git a/corelib/parsing_library_libconfig.c b/corelib/parsing_library_libconfig.c
index 64350f6e..ddb79f6f 100644
--- a/corelib/parsing_library_libconfig.c
+++ b/corelib/parsing_library_libconfig.c
@@ -18,6 +18,7 @@ 
 #include "bsdqueue.h"
 #include "util.h"
 #include "parselib.h"
+#include "parselib-private.h"

 static unsigned int map_field_type(field_type_t type)
 {
diff --git a/corelib/parsing_library_libjson.c b/corelib/parsing_library_libjson.c
index 10fefc8a..4728d200 100644
--- a/corelib/parsing_library_libjson.c
+++ b/corelib/parsing_library_libjson.c
@@ -18,6 +18,7 @@ 
 #include "bsdqueue.h"
 #include "util.h"
 #include "parselib.h"
+#include "parselib-private.h"

 #define MAX_URL_LENGTH 2048

diff --git a/include/parselib.h b/include/parselib.h
index d278cbc4..99b6519f 100644
--- a/include/parselib.h
+++ b/include/parselib.h
@@ -9,6 +9,15 @@ 

 #include <assert.h>
 #include <stdbool.h>
+#include <json-c/json.h>
+#ifdef CONFIG_LIBCONFIG
+#include <libconfig.h>
+#define LIBCONFIG_VERSION ((LIBCONFIG_VER_MAJOR << 16) | \
+	(LIBCONFIG_VER_MINOR << 8) | LIBCONFIG_VER_REVISION)
+#if LIBCONFIG_VERSION < 0x10500
+#define config_setting_lookup config_lookup_from
+#endif
+#endif

 typedef enum {
 	LIBCFG_PARSER,
@@ -32,53 +41,15 @@  typedef void (*iterate_callback)(const char *name, const char *value,
  */
 #define MAX_PARSED_NODES	20

-#ifdef CONFIG_LIBCONFIG
-#include <libconfig.h>
-#define LIBCONFIG_VERSION ((LIBCONFIG_VER_MAJOR << 16) | \
-	(LIBCONFIG_VER_MINOR << 8) | LIBCONFIG_VER_REVISION)
-#if LIBCONFIG_VERSION < 0x10500
-#define config_setting_lookup config_lookup_from
-#endif
-
-bool is_field_numeric_cfg(config_setting_t *e, const char *path);
-void get_field_cfg(config_setting_t *e, const char *path, void *dest, field_type_t type);
-void *get_child_libconfig(void *e, const char *name);
-void iterate_field_libconfig(config_setting_t *e, iterate_callback cb,
-			     void *data);
-const char *get_field_string_libconfig(config_setting_t *e, const char *path);
-void *find_root_libconfig(config_t *cfg, const char **nodes, unsigned int depth);
-void *get_node_libconfig(config_t *cfg, const char **nodes);
-
-#else
-#define config_setting_get_elem(a,b)	(NULL)
-#define config_setting_length(a)	(0)
-#define config_setting_lookup_string(a, b, str) (0)
-#define find_node_libconfig(cfg, field, swcfg) (NULL)
-#define get_field_string_libconfig(e, path)	(NULL)
-#define get_child_libconfig(e, name)		(NULL)
-#define iterate_field_libconfig(e, cb, data)	{ }
-#define get_field_cfg(e, path, dest, type)
-#define find_root_libconfig(cfg, nodes, depth)		(NULL)
-#define get_node_libconfig(cfg, nodes)		(NULL)
-#define is_field_numeric_cfg(e, path)	(false)
-#endif
-
-#include <json-c/json.h>
-
-bool is_field_numeric_json(json_object *e, const char *path);
-const char *get_field_string_json(json_object *e, const char *path);
-void get_field_json(json_object *e, const char *path, void *dest, field_type_t type);
-void *get_child_json(json_object *e, const char *name);
-void iterate_field_json(json_object *e, iterate_callback cb, void *data);
-json_object *find_json_recursive_node(json_object *root, const char **names);
-json_object *json_get_key(json_object *json_root, const char *key);
 const char *json_get_value(struct json_object *json_root,
 			   const char *key);
+json_object *json_get_key(json_object *json_root, const char *key);
 json_object *json_get_path_key(json_object *json_root, const char **json_path);
 char *json_get_data_url(json_object *json_root, const char *key);
-void *find_root_json(json_object *root, const char **nodes, unsigned int depth);
-void *get_node_json(json_object *root, const char **nodes);

+/*
+ * Parselib interface
+ */
 bool is_field_numeric(parsertype p, void *e, const char *path);
 const char *get_field_string(parsertype p, void *e, const char *path);
 void get_field_string_with_size(parsertype p, void *e, const char *path,