OSSP CVS Repository

ossp-pkg/cfg/cfg_node.c 1.14 -> 1.15

--- cfg_node.c 2002/08/01 11:20:39 1.14 +++ cfg_node.c 2002/11/10 12:12:23 1.15 @@ -260,7 +260,7 @@ cfg_node_t *n; if (k == NULL) return CFG_ERR_ARG; - *k = 0; + *k = 0; n = node; while ((n = n->parent) != NULL) (*k)++; @@ -316,18 +316,18 @@ return CFG_OK; } -static cfg_rc_t +static cfg_rc_t cfg_node_select_step1( cfg_t *, cfg_node_t *, cfg_node_t ***, long *, const char *); -static cfg_rc_t +static cfg_rc_t cfg_node_select_step2( cfg_t *, cfg_node_t *, cfg_node_t ***, long *, const char *, const char *, size_t, long, long, long *); -static cfg_rc_t +static cfg_rc_t cfg_node_select_step3( - cfg_t *cfg, - cfg_node_t *node, - cfg_node_t ***result_vec, long *result_len, + cfg_t *cfg, + cfg_node_t *node, + cfg_node_t ***result_vec, long *result_len, const char *spec, const char *cpSel, size_t nSel, long nFilMin, long nFilMax, @@ -359,11 +359,11 @@ return rc; } -static cfg_rc_t +static cfg_rc_t cfg_node_select_step2( - cfg_t *cfg, - cfg_node_t *node, - cfg_node_t ***result_vec, long *result_len, + cfg_t *cfg, + cfg_node_t *node, + cfg_node_t ***result_vec, long *result_len, const char *spec, const char *cpSel, size_t nSel, long nFilMin, long nFilMax, @@ -459,11 +459,11 @@ return rc; } -static cfg_rc_t +static cfg_rc_t cfg_node_select_step1( - cfg_t *cfg, - cfg_node_t *node, - cfg_node_t ***result_vec, long *result_len, + cfg_t *cfg, + cfg_node_t *node, + cfg_node_t ***result_vec, long *result_len, const char *spec) { const char *cpSel; size_t nSel; @@ -481,7 +481,7 @@ return CFG_OK; /* determine selection step information */ - cpSel = spec; + cpSel = spec; nSel = strcspn(cpSel, "[/"); cp = cpSel+nSel; nFilMin = 1; @@ -548,10 +548,10 @@ cfg_rc_t cfg_node_select( - cfg_t *cfg, - cfg_node_t *node, - cfg_node_t ***result_vec, - const char *fmt, + cfg_t *cfg, + cfg_node_t *node, + cfg_node_t ***result_vec, + const char *fmt, ...) { cfg_rc_t rc; @@ -594,22 +594,22 @@ return CFG_OK; } -cfg_rc_t +cfg_rc_t cfg_node_find( - cfg_t *cfg, - cfg_node_t *node, + cfg_t *cfg, + cfg_node_t *node, cfg_rc_t (*cb_fct_cmp)(cfg_t *, cfg_node_t *, void *), - void *cb_ctx_cmp, + void *cb_ctx_cmp, cfg_node_t **cont) { /* FIXME */ return CFG_ERR_INT; } -cfg_rc_t +cfg_rc_t cfg_node_apply( - cfg_t *cfg, - cfg_node_t *node, + cfg_t *cfg, + cfg_node_t *node, cfg_rc_t (*cb_fct_cmp)(cfg_t *, cfg_node_t *, void *), void *cb_ctx_cmp, cfg_rc_t (*cb_fct_cb)(cfg_t *, cfg_node_t *, void *), @@ -625,12 +625,12 @@ if (rc != CFG_ERR_NDE) return rc; if (node->child1 != NULL) - if ((rc = cfg_node_apply(cfg, node->child1, + if ((rc = cfg_node_apply(cfg, node->child1, cb_fct_cmp, cb_ctx_cmp, cb_fct_cb, cb_ctx_cb)) != CFG_OK) return rc; if (node->rbroth != NULL) - if ((rc = cfg_node_apply(cfg, node->rbroth, + if ((rc = cfg_node_apply(cfg, node->rbroth, cb_fct_cmp, cb_ctx_cmp, cb_fct_cb, cb_ctx_cb)) != CFG_OK) return rc; @@ -640,8 +640,8 @@ cfg_rc_t cfg_node_cmp( - cfg_t *cfg, - cfg_node_t *node, + cfg_t *cfg, + cfg_node_t *node, void *token) { if (cfg == NULL || node == NULL || token == NULL) @@ -669,7 +669,7 @@ n->parent = node->parent; n = n->rbroth; } - n->rbroth = node->rbroth; + n->rbroth = node->rbroth; node->rbroth = node2; } else if (attr == CFG_NODE_ATTR_CHILD1) { @@ -684,7 +684,7 @@ node->child1 = node2; } /* FIXME more linkage possibilities */ - else + else return CFG_ERR_ARG; return CFG_OK; }