From: michael Date: Mon, 8 Jun 2015 20:10:49 +0000 (+0000) Subject: - libopm/src/config.c: constification X-Git-Tag: 1.0.8~51 X-Git-Url: http://git.serene-ircd.net/?a=commitdiff_plain;h=77f33806dc810e778415458eb1202731fdb45944;p=hopm.git - libopm/src/config.c: constification git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/branches/1.0.x@6069 82007160-df01-0410-b94d-b575c5fd34c7 --- diff --git a/src/libopm/src/config.c b/src/libopm/src/config.c index 7cc5f59..0d76c8e 100644 --- a/src/libopm/src/config.c +++ b/src/libopm/src/config.c @@ -59,11 +59,9 @@ static OPM_CONFIG_HASH_T HASH[] = OPM_CONFIG_T * libopm_config_create(void) { - unsigned int num; + const unsigned int num = sizeof(HASH) / sizeof(OPM_CONFIG_HASH_T); OPM_CONFIG_T *ret; - num = sizeof(HASH) / sizeof(OPM_CONFIG_HASH_T); - ret = xcalloc(sizeof(OPM_CONFIG_T)); ret->vars = xcalloc(sizeof(void *) * num); @@ -118,13 +116,11 @@ libopm_config_create(void) void libopm_config_free(OPM_CONFIG_T *config) { - unsigned int num; + const unsigned int num = sizeof(HASH) / sizeof(OPM_CONFIG_HASH_T); OPM_NODE_T *p, *next; OPM_LIST_T *list; - num = sizeof(HASH) / sizeof(OPM_CONFIG_HASH_T); - - for (unsigned int i = 0; i < num; i++) + for (unsigned int i = 0; i < num; ++i) { if (config->vars[i] == NULL) continue; @@ -169,11 +165,9 @@ libopm_config_free(OPM_CONFIG_T *config) OPM_ERR_T libopm_config_set(OPM_CONFIG_T *config, unsigned int key, const void *value) { - unsigned int num; + const unsigned int num = sizeof(HASH) / sizeof(OPM_CONFIG_HASH_T); OPM_NODE_T *node; - num = sizeof(HASH) / sizeof(OPM_CONFIG_HASH_T); - if (key >= num) return OPM_ERR_BADKEY; /* Return appropriate error code eventually */ @@ -221,7 +215,7 @@ libopm_config_set(OPM_CONFIG_T *config, unsigned int key, const void *value) int libopm_config_gettype(int key) { - unsigned int num = sizeof(HASH) / sizeof(OPM_CONFIG_HASH_T); + const unsigned int num = sizeof(HASH) / sizeof(OPM_CONFIG_HASH_T); for (unsigned int i = 0; i < num; ++i) if (HASH[i].key == key)