INI: make 'ini_*_serialize' API private

This allows to not expose "simplebuffer.h"

Author: alexey-tikhonov

ini/ini_comment.c

@@ -25,6 +25,8 @@
 #include <ctype.h>
 #include "trace.h"
 #include "ref_array.h"
+#include "ini_configobj.h"
+#include "ini_config_priv.h"
 #include "simplebuffer.h"
 #include "ini_comment.h"
 #include "ini_defines.h"

ini/ini_comment.h

@@ -24,7 +24,6 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include "simplebuffer.h"
 
 #ifndef EOK
 #define EOK 0
@@ -150,12 +149,6 @@ int ini_comment_copy(struct ini_comment *ic,
 int ini_comment_add(struct ini_comment *ic_to_add,
                     struct ini_comment *ic);
 
-/**
- * Serialize comment
- */
-int ini_comment_serialize(struct ini_comment *ic,
-                          struct simplebuffer *sbobj);
-
 /**
  * Internal function to print comment
  */

ini/ini_config_priv.h

@@ -109,6 +109,32 @@ int access_check_int(struct stat *file_stats,
                      mode_t mode,
                      mode_t mask);
 
+/**
+ * @brief Serialize configuration object
+ *
+ * Serialize configuration object into provided buffer.
+ * Use buffer object functions to manipulate or save
+ * the buffer to a file/stream.
+ *
+ * @param[in]  ini_config       Configuration object.
+ * @param[out] sbobj            Serialized configuration.
+ *
+ * @return 0 - Success.
+ * @return EINVAL - Invalid parameter.
+ * @return ENOMEM - No memory.
+ */
+int ini_config_serialize(struct ini_cfgobj *ini_config,
+                         struct simplebuffer *sbobj);
+
+/* Serialize value */
+int value_serialize(struct value_obj *vo,
+                    const char *key,
+                    struct simplebuffer *sbobj);
+
+/* Serialize comment */
+int ini_comment_serialize(struct ini_comment *ic,
+                          struct simplebuffer *sbobj);
+
 struct ini_errmsg;
 
 struct ini_errobj {

ini/ini_configobj.h

@@ -29,7 +29,6 @@
 #include <unistd.h>
 #include <limits.h>
 #include <stdio.h>
-#include "simplebuffer.h"
 #include "ini_valueobj.h"
 
 #ifndef DING_ATTR_FORMAT
@@ -1112,24 +1111,6 @@ int ini_config_augment(struct ini_cfgobj *base_cfg,
 int ini_config_set_wrap(struct ini_cfgobj *ini_config,
                         uint32_t boundary);
 
-/**
- * @brief Serialize configuration object
- *
- * Serialize configuration object into provided buffer.
- * Use buffer object functions to manipulate or save
- * the buffer to a file/stream.
- *
- * @param[in]  ini_config       Configuration object.
- * @param[out] sbobj            Serialized configuration.
- *
- * @return 0 - Success.
- * @return EINVAL - Invalid parameter.
- * @return ENOMEM - No memory.
- */
-int ini_config_serialize(struct ini_cfgobj *ini_config,
-                         struct simplebuffer *sbobj);
-
-
 /* Functions that add, modify or delete sections and values in
  * the configuration object can be found in section \ref ini_mod.
  */

ini/ini_valueobj.c

@@ -26,6 +26,8 @@
 #include <ctype.h>
 #include "simplebuffer.h"
 #include "ref_array.h"
+#include "ini_configobj.h"
+#include "ini_config_priv.h"
 #include "ini_comment.h"
 #include "ini_defines.h"
 #include "ini_valueobj.h"

ini/ini_valueobj.h

@@ -24,7 +24,6 @@
 #define INI_VALUEOBJ_H
 
 #include "ref_array.h"
-#include "simplebuffer.h"
 #include "ini_comment.h"
 
 struct value_obj;
@@ -136,12 +135,7 @@ int value_put_comment(struct value_obj *vo,
 int value_merge_comment(struct value_obj *vo_donor,
                         struct value_obj *vo);
 
-/* Serialize value */
-int value_serialize(struct value_obj *vo,
-                    const char *key,
-                    struct simplebuffer *sbobj);
-
 /* Print value */
 void value_print(const char *key, struct value_obj *vo);
 
-#endif
+#endif