diff options
| -rw-r--r-- | filescan-utils.c | 8 | ||||
| -rw-r--r-- | filescan-utils.h | 17 |
2 files changed, 10 insertions, 15 deletions
diff --git a/filescan-utils.c b/filescan-utils.c index 8b70d69..d590aab 100644 --- a/filescan-utils.c +++ b/filescan-utils.c @@ -27,7 +27,7 @@ #include "filescan-utils.h" // List Avaliable Configuration Files -PUBLIC json_object* ScanForConfig (const char* searchPath, CtlScanDirModeT mode, const char *pre, const char *ext) { +json_object* ScanForConfig (const char* searchPath, CtlScanDirModeT mode, const char *pre, const char *ext) { json_object *responseJ; char *dirPath; char* dirList= strdup(searchPath); @@ -95,7 +95,7 @@ PUBLIC json_object* ScanForConfig (const char* searchPath, CtlScanDirModeT mode, return (responseJ); } -PUBLIC const char *GetMidleName(const char*name) { +const char *GetMidleName(const char*name) { char *fullname = strdup(name); for (int idx = 0; fullname[idx] != '\0'; idx++) { @@ -114,7 +114,7 @@ PUBLIC const char *GetMidleName(const char*name) { return ""; } -PUBLIC const char *GetBinderName() { +const char *GetBinderName() { static char *binderName=NULL; if (binderName) return binderName; @@ -131,7 +131,7 @@ PUBLIC const char *GetBinderName() { } #ifndef USE_API_DYN -PUBLIC char *GetBindingDirPath() +char *GetBindingDirPath() { // A file description should not be greater than 999.999.999 char fd_link[CONTROL_MAXPATH_LEN]; diff --git a/filescan-utils.h b/filescan-utils.h index 940eafd..c282c2b 100644 --- a/filescan-utils.h +++ b/filescan-utils.h @@ -32,17 +32,12 @@ #include <afb/afb-binding.h> extern afb_dynapi *AFB_default; #define AFB_DEBUG(...) AFB_DYNAPI_DEBUG(AFB_default, __VA_ARGS__) -#else +#else #define AFB_BINDING_VERSION 2 #include <afb/afb-binding.h> #endif - -#include <json-c/json.h> -#ifndef PUBLIC - #define PUBLIC -#endif -#define STATIC static +#include <json-c/json.h> #ifndef CONTROL_MAXPATH_LEN #define CONTROL_MAXPATH_LEN 255 @@ -53,10 +48,10 @@ typedef enum { CTL_SCAN_RECURSIVE=1, } CtlScanDirModeT; -PUBLIC const char *GetMidleName(const char*name); -PUBLIC const char *GetBinderName(); -PUBLIC json_object* ScanForConfig (const char* searchPath, CtlScanDirModeT mode, const char *pre, const char *ext); -PUBLIC char *GetBindingDirPath(); +const char *GetMidleName(const char*name); +const char *GetBinderName(); +json_object* ScanForConfig (const char* searchPath, CtlScanDirModeT mode, const char *pre, const char *ext); +char *GetBindingDirPath(); #ifdef __cplusplus |