Skip to content

Commit 1a53485

Browse files
committed
Move "fsdev" out of public API
This is a low level implementation detail which we probably shouldn't publish in our public API.
1 parent 21b8f02 commit 1a53485

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

docs/modules

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
* @defgroup PROBEHANDLERS Probe handler API
2525
* @defgroup PROBESESSION Probe session API
2626
* @defgroup PROBEAPI Common probe API - object, entity, item manipulation
27-
* @defgroup PROBEAUXAPI Auxilirary functions for probes
2827
* @defgroup SEXPRESSIONS SEAP and S-expression API
2928
* @}
3029
* @}

src/OVAL/probes/fsdev.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
* @brief fsdev API implementation
44
* @author "Daniel Kopecek" <[email protected]>
55
*
6-
* @addtogroup PROBEAUXAPI
7-
* @{
86
*/
97
/*
108
* Copyright 2009 Red Hat Inc., Durham, North Carolina.
@@ -467,4 +465,3 @@ int fsdev_fd(fsdev_t * lfs, int fd)
467465

468466
return fsdev_search(lfs, &st.st_dev);
469467
}
470-
/// @}

src/OVAL/probes/public/fsdev.h renamed to src/OVAL/probes/fsdev.h

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
/**
22
* @file fsdev.h
3-
* @brief fsdev API public header file
3+
* @brief fsdev header file
44
* @author "Daniel Kopecek" <[email protected]>
55
*
6-
* @addtogroup PROBEAUXAPI
7-
* @{
86
*/
97
/*
108
* Copyright 2009 Red Hat Inc., Durham, North Carolina.
@@ -49,23 +47,23 @@ typedef struct {
4947
* Initialize the fsdev_t structure from an array of filesystem
5048
* names.
5149
*/
52-
OSCAP_API fsdev_t *fsdev_init(const char **fs, size_t fs_cnt);
50+
fsdev_t *fsdev_init(const char **fs, size_t fs_cnt);
5351

5452
/**
5553
* Initialize the fsdev_t structure from a string containing filesystem
5654
* names.
5755
*/
58-
OSCAP_API fsdev_t *fsdev_strinit(const char *fs_names);
56+
fsdev_t *fsdev_strinit(const char *fs_names);
5957

6058
/**
6159
* Free the fsdev_t structure.
6260
*/
63-
OSCAP_API void fsdev_free(fsdev_t * lfs);
61+
void fsdev_free(fsdev_t *lfs);
6462

6563
/**
6664
* Search an id in the fsdev_t structure.
6765
*/
68-
OSCAP_API int fsdev_search(fsdev_t * lfs, void *id);
66+
int fsdev_search(fsdev_t *lfs, void *id);
6967

7068
/**
7169
* Check whether a path points points to a place on any of the devices
@@ -76,7 +74,7 @@ OSCAP_API int fsdev_search(fsdev_t * lfs, void *id);
7674
* @retval 0 otherwise
7775
* @retval -1 error
7876
*/
79-
OSCAP_API int fsdev_path(fsdev_t * lfs, const char *path);
77+
int fsdev_path(fsdev_t *lfs, const char *path);
8078

8179
/**
8280
* Check whether a file descriptor is associated with a file that resides
@@ -87,7 +85,6 @@ OSCAP_API int fsdev_path(fsdev_t * lfs, const char *path);
8785
* @retval 0 otherwise
8886
* @retval -1 error
8987
*/
90-
OSCAP_API int fsdev_fd(fsdev_t * lfs, int fd);
88+
int fsdev_fd(fsdev_t *lfs, int fd);
9189

9290
#endif /* FSDEV_H */
93-
/// @}

tests/API/probes/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ target_include_directories(test_api_probes_smoke PUBLIC
1212
file(GLOB_RECURSE OVAL_RESULTS_SOURCES "${CMAKE_SOURCE_DIR}/src/OVAL/results/oval_cmp*.c")
1313
add_oscap_test_executable(oval_fts_list
1414
"oval_fts_list.c"
15+
"${CMAKE_SOURCE_DIR}/src/OVAL/probes/fsdev.c"
1516
"${CMAKE_SOURCE_DIR}/src/OVAL/probes/oval_fts.c"
1617
"${CMAKE_SOURCE_DIR}/src/common/error.c"
1718
"${CMAKE_SOURCE_DIR}/src/common/err_queue.c"

0 commit comments

Comments
 (0)