diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-22 15:46:49 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-22 15:46:49 +0300 |
commit | f084fa4882906ce3729e157373ea37d8bb24517f (patch) | |
tree | d01f5c31d899f12e7f08a049d075410d51a31a6a | |
parent | e9f722a93dd147f76f3fe3edd3fef3b7a7c481eb (diff) | |
download | slb-f084fa4882906ce3729e157373ea37d8bb24517f.tar.gz slb-f084fa4882906ce3729e157373ea37d8bb24517f.tar.bz2 |
Rename varinst_clear=>varinst_unset; varinst_reset=>varinst_clear.
New names describe what these functions actually do.
-rw-r--r-- | src/slb.h | 2 | ||||
-rw-r--r-- | src/snmploop.c | 4 | ||||
-rw-r--r-- | src/symimp.c | 12 | ||||
-rw-r--r-- | src/test.c | 2 |
4 files changed, 10 insertions, 10 deletions
@@ -215,8 +215,8 @@ struct slb_macro *macro_lookup(struct grecs_symtab *mt, struct slb_macro *macro_lookupz(struct grecs_symtab *mt, const char *name, int *install); +void varinst_unset(struct grecs_symtab *vit); void varinst_clear(struct grecs_symtab *vit); -void varinst_reset(struct grecs_symtab *vit); int varinst_allset(struct grecs_symtab *vit); struct grecs_symtab *create_oidtab(struct grecs_symtab *vit); diff --git a/src/snmploop.c b/src/snmploop.c index f94cca5..8e26d3d 100644 --- a/src/snmploop.c +++ b/src/snmploop.c @@ -166,7 +166,7 @@ process_result(struct slb_server *srv, struct snmp_pdu *pdu) case E_VARINST_OVERFLOW: slb_node_state_init(srv->state); srv->expr->ex_eval_count = 0; - varinst_reset(srv->varinst); + varinst_clear(srv->varinst); return; } } @@ -311,7 +311,7 @@ send_requests() continue; } - varinst_clear(srv->varinst); + varinst_unset(srv->varinst); srv->flags &= ~SLB_SRV_COMPUTED; req = snmp_pdu_create(SNMP_MSG_GET); diff --git a/src/symimp.c b/src/symimp.c index 4ec99c0..2d54c18 100644 --- a/src/symimp.c +++ b/src/symimp.c @@ -78,7 +78,7 @@ varinst_lookupz(struct grecs_symtab *vit, const char *name, int *install) } static int -_varinst_clear(void *sym, void *data) +_varinst_unset(void *sym, void *data) { struct slb_varinstance *vp = sym; if (vp->vi_flags & SLV_VIF_SNMP) @@ -89,13 +89,13 @@ _varinst_clear(void *sym, void *data) } void -varinst_clear(struct grecs_symtab *vit) +varinst_unset(struct grecs_symtab *vit) { - grecs_symtab_enumerate(vit, _varinst_clear, NULL); + grecs_symtab_enumerate(vit, _varinst_unset, NULL); } static int -_varinst_reset(void *sym, void *data) +_varinst_clear(void *sym, void *data) { struct slb_varinstance *vp = sym; if (vp->vi_flags & SLV_VIF_SNMP) { @@ -107,9 +107,9 @@ _varinst_reset(void *sym, void *data) } void -varinst_reset(struct grecs_symtab *vit) +varinst_clear(struct grecs_symtab *vit) { - grecs_symtab_enumerate(vit, _varinst_reset, NULL); + grecs_symtab_enumerate(vit, _varinst_clear, NULL); } static int @@ -148,7 +148,7 @@ test_server_replies() if (srv->flags & SLB_SRV_DISABLED) continue; - varinst_clear(srv->varinst); + varinst_unset(srv->varinst); srv->flags &= ~SLB_SRV_COMPUTED; server_process_pdu(srv->test_pdu ? |