Make SEAP string buffer private

Author: jan-cerny

src/OVAL/probes/SEAP/_sexp-output.h

@@ -30,6 +30,7 @@
 #include "public/sexp-output.h"
 #include "_sexp-manip.h"
 #include "../../../common/util.h"
+#include "generic/strbuf.h"
 
 
 struct SEXP_ostate {

src/OVAL/probes/SEAP/public/strbuf.h renamed to src/OVAL/probes/SEAP/generic/strbuf.h

@@ -54,23 +54,23 @@ typedef struct {
         size_t         size;
 } strbuf_t;
 
-OSCAP_API strbuf_t *strbuf_new  (size_t max);
-OSCAP_API void      strbuf_free (strbuf_t *buf);
+strbuf_t *strbuf_new(size_t max);
+void strbuf_free(strbuf_t *buf);
 
-OSCAP_API int strbuf_add   (strbuf_t *buf, const char *str, size_t len);
-OSCAP_API int strbuf_addf  (strbuf_t *buf, char *str, size_t len);
-OSCAP_API int strbuf_addc (strbuf_t *buf, char ch);
+int strbuf_add(strbuf_t *buf, const char *str, size_t len);
+int strbuf_addf(strbuf_t *buf, char *str, size_t len);
+int strbuf_addc(strbuf_t *buf, char ch);
 
-OSCAP_API size_t strbuf_size (strbuf_t *buf);
-OSCAP_API int    strbuf_trunc  (strbuf_t *buf, size_t len);
-OSCAP_API size_t strbuf_length (strbuf_t *buf);
+size_t strbuf_size(strbuf_t *buf);
+int strbuf_trunc(strbuf_t *buf, size_t len);
+size_t strbuf_length(strbuf_t *buf);
 
-OSCAP_API char *strbuf_cstr   (strbuf_t *buf);
-OSCAP_API char *strbuf_cstr_r (strbuf_t *buf, char *str, size_t len);
-OSCAP_API char *strbuf_copy (strbuf_t *buf, void *dst, size_t len);
+char *strbuf_cstr(strbuf_t *buf);
+char *strbuf_cstr_r(strbuf_t *buf, char *str, size_t len);
+char *strbuf_copy(strbuf_t *buf, void *dst, size_t len);
 
-OSCAP_API size_t strbuf_fwrite (FILE *fp, strbuf_t *buf);
-OSCAP_API ssize_t strbuf_write  (strbuf_t *buf, int fd);
+size_t strbuf_fwrite(FILE *fp, strbuf_t *buf);
+ssize_t strbuf_write(strbuf_t *buf, int fd);
 
 #ifdef __cplusplus
 }

src/OVAL/probes/SEAP/public/sexp-output.h

@@ -31,7 +31,7 @@
 #include <unistd.h>
 #endif
 #include <sexp-types.h>
-#include <strbuf.h>
+#include "generic/strbuf.h"
 #include "oscap_export.h"
 
 #ifdef __cplusplus

src/OVAL/probes/SEAP/sexp-output.c

@@ -38,7 +38,7 @@
 #include <assert.h>
 
 #include "generic/common.h"
-#include "public/strbuf.h"
+#include "generic/strbuf.h"
 #include "_sexp-types.h"
 #include "_sexp-output.h"
 #include "_sexp-value.h"