moves helpers from config to helper-api

Change-Id: Iecba4a22718b76a3188986eae814c359d21bbd78
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

1 files changed, 34 insertions, 34 deletions

diff --git a/include/proto-def.h b/include/proto-def.h
index a030a27b..89b6e3d3 100644
--- a/include/proto-def.h
+++ b/include/proto-def.h
@@ -20,54 +20,54 @@
 */
 
 // helper-api
-PUBLIC json_object* getPingTest(AFB_request *request);
-PUBLIC const char* getQueryValue (const AFB_request * request, const char *name);
-PUBLIC int getQueryAll(AFB_request * request, char *query, size_t len);
-PUBLIC AFB_PostHandle* getPostHandle (AFB_request *request);
-PUBLIC json_object* getPostFile (AFB_request *request, AFB_PostItem *item, char* destination) ;
-PUBLIC AFB_PostCtx* getPostContext (AFB_request *request);
-PUBLIC char* getPostPath (AFB_request *request);
+extern json_object* getPingTest(AFB_request *request);
+extern const char* getQueryValue (const AFB_request * request, const char *name);
+extern int getQueryAll(AFB_request * request, char *query, size_t len);
+extern AFB_PostHandle* getPostHandle (AFB_request *request);
+extern json_object* getPostFile (AFB_request *request, AFB_PostItem *item, char* destination) ;
+extern AFB_PostCtx* getPostContext (AFB_request *request);
+extern char* getPostPath (AFB_request *request);
+
+extern json_object *jsonNewMessage (AFB_error level, char* format, ...);
+extern json_object *jsonNewStatus (AFB_error level);
+extern json_object *jsonNewjtype (void);
+extern json_object *jsonNewMessage (AFB_error level, char* format, ...);
+extern void jsonDumpObject (json_object * jObject);
+
+extern char *configTime        (void);
 
 // rest-api
-PUBLIC void endPostRequest(AFB_PostHandle *posthandle); 
-PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, const char* url, const char *method
+extern void endPostRequest(AFB_PostHandle *posthandle); 
+extern int doRestApi(struct MHD_Connection *connection, AFB_session *session, const char* url, const char *method
     , const char *upload_data, size_t *upload_data_size, void **con_cls);
 
-void initPlugins (AFB_session *session);
+extern void initPlugins (AFB_session *session);
 
-typedef AFB_plugin* (*AFB_pluginCB)();
-PUBLIC  AFB_plugin* pluginRegister ();
+extern  AFB_plugin* pluginRegister ();
 
 // Session handling
-PUBLIC AFB_error sessionCheckdir     (AFB_session *session);
-PUBLIC json_object *sessionList      (AFB_session *session, AFB_request *request);
-PUBLIC json_object *sessionToDisk    (AFB_session *session, AFB_request *request, char *name,json_object *jsonSession);
-PUBLIC json_object *sessionFromDisk  (AFB_session *session, AFB_request *request, char *name);
+extern AFB_error sessionCheckdir     (AFB_session *session);
+extern json_object *sessionList      (AFB_session *session, AFB_request *request);
+extern json_object *sessionToDisk    (AFB_session *session, AFB_request *request, char *name,json_object *jsonSession);
+extern json_object *sessionFromDisk  (AFB_session *session, AFB_request *request, char *name);
 
-PUBLIC AFB_error ctxTokenRefresh (AFB_clientCtx *clientCtx, AFB_request *request);
-PUBLIC AFB_error ctxTokenCreate (AFB_clientCtx *clientCtx, AFB_request *request);
-PUBLIC AFB_error ctxTokenCheck (AFB_clientCtx *clientCtx, AFB_request *request);
-PUBLIC AFB_error ctxTokenReset (AFB_clientCtx *clientCtx, AFB_request *request);
-PUBLIC AFB_clientCtx *ctxClientGet (AFB_request *request, int idx);
-PUBLIC void      ctxStoreInit (int);
+extern AFB_error ctxTokenRefresh (AFB_clientCtx *clientCtx, AFB_request *request);
+extern AFB_error ctxTokenCreate (AFB_clientCtx *clientCtx, AFB_request *request);
+extern AFB_error ctxTokenCheck (AFB_clientCtx *clientCtx, AFB_request *request);
+extern AFB_error ctxTokenReset (AFB_clientCtx *clientCtx, AFB_request *request);
+extern AFB_clientCtx *ctxClientGet (AFB_request *request, int idx);
+extern void      ctxStoreInit (int);
 
 
 
 // Httpd server
-PUBLIC AFB_error httpdStart          (AFB_session *session);
-PUBLIC AFB_error httpdLoop           (AFB_session *session);
-PUBLIC void  httpdStop               (AFB_session *session);
+extern AFB_error httpdStart          (AFB_session *session);
+extern AFB_error httpdLoop           (AFB_session *session);
+extern void  httpdStop               (AFB_session *session);
 
 
 // config management
-PUBLIC char *configTime        (void);
-PUBLIC AFB_session *configInit (void);
-PUBLIC json_object *jsonNewMessage (AFB_error level, char* format, ...);
-PUBLIC json_object *jsonNewStatus (AFB_error level);
-PUBLIC json_object *jsonNewjtype (void);
-PUBLIC json_object *jsonNewMessage (AFB_error level, char* format, ...);
-PUBLIC void jsonDumpObject (json_object * jObject);
-PUBLIC AFB_error configLoadFile (AFB_session * session, AFB_config *cliconfig);
-PUBLIC void configStoreFile (AFB_session * session);
+extern AFB_session *configInit (void);
+extern AFB_error configLoadFile (AFB_session * session, AFB_config *cliconfig);