Merge pull request #1196 from jan-cerny/unused_removal

Remove unused code

Author: matejak

src/OVAL/probes/SEAP/CMakeLists.txt

@@ -6,8 +6,7 @@ file(GLOB_RECURSE SEAP_HEADERS "*.h")
 file(GLOB_RECURSE RBT_SOURCES "generic/rbt/*.c")
 file(GLOB_RECURSE RBT_HEADERS "generic/rbt/*.h")
 
-file(GLOB_RECURSE SEAP_SOURCES_TO_REMOVE "sexp-handler.c")
-list(REMOVE_ITEM SEAP_SOURCES ${SEAP_SOURCES_TO_REMOVE} ${RBT_SOURCES} ${RBT_HEADERS})
+list(REMOVE_ITEM SEAP_SOURCES ${RBT_SOURCES} ${RBT_HEADERS})
 
 if(ENABLE_PROBES)
 	add_library(seap_object OBJECT ${SEAP_SOURCES} ${SEAP_HEADERS})

src/OVAL/probes/SEAP/generic/strbuf.c

@@ -164,31 +164,12 @@ int strbuf_addf (strbuf_t *buf, char *str, size_t len)
                 return (ret);
 }
 
-int strbuf_add0 (strbuf_t *buf, const char *str)
-{
-        return __strbuf_add (buf, (char *)str, strlen (str));
-}
-
 int strbuf_addc (strbuf_t *buf, char ch)
 {
         /* XXX: direct? */
         return __strbuf_add (buf, &ch, 1);
 }
 
-int strbuf_add0f (strbuf_t *buf, char *str)
-{
-        int ret;
-
-        ret = __strbuf_add (buf, str, strlen (str));
-
-        if (ret == 0) {
-                free (str);
-                return (0);
-        }
-
-        return (ret);
-}
-
 int strbuf_trunc (strbuf_t *buf, size_t len)
 {
         return (0);

src/OVAL/probes/SEAP/public/helpers.h

@@ -48,7 +48,6 @@ typedef uint8_t  SEAP_cmdtype_t;
 #define SEAP_CMDREG_THREAD 0x00000004
 
 OSCAP_API int SEAP_cmd_register   (SEAP_CTX_t *ctx, SEAP_cmdcode_t code, uint32_t flags, SEAP_cmdfn_t func, ...);
-OSCAP_API int SEAP_cmd_unregister (SEAP_CTX_t *ctx, SEAP_cmdcode_t code);
 
 #define SEAP_EXEC_LOCAL  0x01
 #define SEAP_EXEC_LONLY  0x02

src/OVAL/probes/SEAP/public/seap-command.h

@@ -52,13 +52,10 @@ OSCAP_API int     SEAP_msg_set (SEAP_msg_t *msg, SEXP_t *sexp);
 OSCAP_API void    SEAP_msg_unset (SEAP_msg_t *msg);
 OSCAP_API SEXP_t *SEAP_msg_get (SEAP_msg_t *msg);
 
-OSCAP_API SEXP_t *SEAP_msgattr_get (SEAP_msg_t *msg, const char *name);
 OSCAP_API int     SEAP_msgattr_set (SEAP_msg_t *msg, const char *name, SEXP_t *value);
-OSCAP_API int     SEAP_msgattr_del (SEAP_msg_t *msg, const char *name);
 OSCAP_API bool    SEAP_msgattr_exists (SEAP_msg_t *msg, const char *name);
 
 #include <stdio.h>
-OSCAP_API void SEAP_msg_print (FILE *fp, SEAP_msg_t *msg);
 
 #ifdef __cplusplus
 }

src/OVAL/probes/SEAP/public/seap-message.h

@@ -55,8 +55,6 @@ OSCAP_API void        SEAP_CTX_init (SEAP_CTX_t *ctx);
 OSCAP_API void        SEAP_CTX_free (SEAP_CTX_t *ctx);
 
 OSCAP_API int SEAP_connect(SEAP_CTX_t *ctx);
-OSCAP_API int     SEAP_listen (SEAP_CTX_t *ctx, int sd, uint32_t maxcli);
-OSCAP_API int     SEAP_accept (SEAP_CTX_t *ctx, int sd);
 
 OSCAP_API int     SEAP_open  (SEAP_CTX_t *ctx, const char *path, uint32_t flags);
 OSCAP_API SEXP_t *SEAP_read  (SEAP_CTX_t *ctx, int sd);
@@ -67,14 +65,6 @@ OSCAP_API int SEAP_openfd (SEAP_CTX_t *ctx, int fd, uint32_t flags);
 OSCAP_API int SEAP_openfd2 (SEAP_CTX_t *ctx, int ifd, int ofd, uint32_t flags);
 OSCAP_API int SEAP_add_probe(SEAP_CTX_t *ctx, sch_queuedata_t *data);
 
-OSCAP_API SEAP_msg_t *SEAP_msg_new (void);
-OSCAP_API void        SEAP_msg_free (SEAP_msg_t *msg);
-OSCAP_API int         SEAP_msg_set (SEAP_msg_t *msg, SEXP_t *sexp);
-OSCAP_API SEXP_t     *SEAP_msg_get (SEAP_msg_t *msg);
-
-OSCAP_API int     SEAP_msgattr_set (SEAP_msg_t *msg, const char *attr, SEXP_t *value);
-OSCAP_API SEXP_t *SEAP_msgattr_get (SEAP_msg_t *msg, const char *name);
-
 OSCAP_API int SEAP_recvsexp (SEAP_CTX_t *ctx, int sd, SEXP_t **sexp);
 OSCAP_API int SEAP_recvmsg  (SEAP_CTX_t *ctx, int sd, SEAP_msg_t **seap_msg);
 

src/OVAL/probes/SEAP/public/seap-scheme.h

@@ -32,6 +32,5 @@ typedef uint64_t SEXP_ID_t;
  * Compute an S-exp value identifier
  */
 OSCAP_API SEXP_ID_t SEXP_ID_v(const SEXP_t *s);
-OSCAP_API SEXP_ID_t SEXP_ID_v2(const SEXP_t *s);
 
 #endif /* SEXP_ID_H */

src/OVAL/probes/SEAP/public/seap.h

@@ -40,14 +40,6 @@ typedef struct SEXP_datatypeTbl SEXP_datatypeTbl_t;
 
 extern SEXP_datatypeTbl_t g_datatypes;
 
-OSCAP_API /* const char *SEXP_datatype (const SEXP_t *sexp); */
-
-OSCAP_API int SEXP_datatype_register (SEXP_datatypeTbl_t *t, const char *datatype);
-OSCAP_API /* int SEXP_datatype_unregister (void); */
-
-OSCAP_API int SEXP_datatype_op (uint8_t op, const SEXP_t *sexp, void *res, ...);
-OSCAP_API int SEXP_datatype_op_safe (const char *datatype, uint8_t op, const SEXP_t *sexp, void *res, ...);
-
 OSCAP_API SEXP_datatype_t *SEXP_datatype_new(void);
 OSCAP_API int SEXP_datatype_setflag(SEXP_datatype_t **dp, uint16_t flag, ...);
 OSCAP_API int SEXP_datatype_unsetflag(SEXP_datatype_t **dp, uint16_t flag);