experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

renamed plugin_find/each to clixon_plugin_find/each

Browse source
This commit is contained in:
Olof Hagsand 2018-04-08 14:10:06 +00:00
parent 2e00411621
commit 0907574acf
5 changed files with 41 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/clixon/clixon_plugin.h
View file

@ -50,13 +50,19 @@
/* Dynamicically loadable plugin object handle. @see return value of dlopen(3) */
typedef void *plghndl_t;
/* Registered RPC callback function */
/*! Registered RPC callback function
* @param[in] h Clicon handle
* @param[in] xn Request: <rpc><xn></rpc>
* @param[out] cbret Return xml tree, eg <rpc-reply>..., <rpc-error..
* @param[in] arg Domain specific arg, ec client-entry or FCGX_Request
* @param[in] regarg User argument given at rpc_callback_register()
*/
typedef int (*clicon_rpc_cb)(
clicon_handle h, /* Clicon handle */
cxobj *xn, /* Request: <rpc><xn></rpc> */
cbuf *cbret, /* Return xml tree, eg <rpc-reply>..., <rpc-error.. */
void *arg, /* Domain specific arg, ec client-entry */
void *regarg /* User argument given at rpc_callback_register() */
clicon_handle h,
cxobj *xn,
cbuf *cbret,
void *arg,
void *regarg
);
/*
@ -155,11 +161,11 @@ typedef struct clixon_plugin clixon_plugin;
*/
clixon_plugin_api *clixon_plugin_init(clicon_handle h);
clixon_plugin *plugin_each(clicon_handle h, clixon_plugin *cpprev);
clixon_plugin *clixon_plugin_each(clicon_handle h, clixon_plugin *cpprev);
clixon_plugin *plugin_each_revert(clicon_handle h, clixon_plugin *cpprev, int nr);
clixon_plugin *clixon_plugin_each_revert(clicon_handle h, clixon_plugin *cpprev, int nr);
clixon_plugin *plugin_find(clicon_handle h, char *name);
clixon_plugin *clixon_plugin_find(clicon_handle h, char *name);
int clixon_plugins_load(clicon_handle h, char *function, char *dir);
@ -171,6 +177,7 @@ int clixon_plugin_auth(clicon_handle h, void *arg);
/* rpc callback API */
int rpc_callback_register(clicon_handle h, clicon_rpc_cb cb, void *arg, char *tag);
int rpc_callback_delete_all(void);
int rpc_callback_call(clicon_handle h, cxobj *xe, cbuf *cbret, void *arg);

18
lib/src/clixon_plugin.c
View file

@ -76,15 +76,15 @@ static int _clixon_nplugins = 0; /* Number of plugins */
* @param[in] plugin previous plugin, or NULL on init
* @code
* clicon_plugin *cp = NULL;
* while ((cp = plugin_each(h, cp)) != NULL) {
* while ((cp = clixon_plugin_each(h, cp)) != NULL) {
* ...
* }
* @endcode
* @note Not optimized, alwasy iterates from the start of the list
*/
clixon_plugin *
plugin_each(clicon_handle h,
clixon_plugin *cpprev)
clixon_plugin_each(clicon_handle h,
clixon_plugin *cpprev)
{
int i;
clixon_plugin *cp;
@ -114,16 +114,16 @@ plugin_each(clicon_handle h,
* @param[in] plugin previous plugin, or NULL on init
* @code
* clicon_plugin *cp = NULL;
* while ((cp = plugin_each_revert(h, cp, nr)) != NULL) {
* while ((cp = clixon_plugin_each_revert(h, cp, nr)) != NULL) {
* ...
* }
* @endcode
* @note Not optimized, alwasy iterates from the start of the list
*/
clixon_plugin *
plugin_each_revert(clicon_handle h,
clixon_plugin *cpprev,
int nr)
clixon_plugin_each_revert(clicon_handle h,
clixon_plugin *cpprev,
int nr)
{
int i;
clixon_plugin *cp;
@ -151,8 +151,8 @@ plugin_each_revert(clicon_handle h,
* @retval NULL Not found
*/
clixon_plugin *
plugin_find(clicon_handle h,
char *name)
clixon_plugin_find(clicon_handle h,
char *name)
{
int i;
clixon_plugin *cp = NULL;