diff options
| author | Timo Sirainen <cras@irssi.org> | 2002-10-25 13:57:16 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2002-10-25 13:57:16 +0000 |
| commit | b05cfc62e0d014826219ad53bb0465d632061ff7 (patch) | |
| tree | 402e9d6615d443fc92f02c08ff5d4abf2800a4e8 /src/lib-config | |
| parent | ca4328e3ab57d0c7cb5fa86b3ff21ea27a3165f2 (diff) | |
| download | irssi-b05cfc62e0d014826219ad53bb0465d632061ff7.zip | |
config_node_nth() and config_node_index() don't count comments in config
anymore. fixes problems having comments in channels and servers block.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2971 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/lib-config')
| -rw-r--r-- | src/lib-config/get.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/src/lib-config/get.c b/src/lib-config/get.c index 2df0cc90..ccc8c689 100644 --- a/src/lib-config/get.c +++ b/src/lib-config/get.c @@ -276,9 +276,14 @@ CONFIG_NODE *config_node_nth(CONFIG_NODE *node, int index) g_return_val_if_fail(node != NULL, NULL); g_return_val_if_fail(is_node_list(node), NULL); - for (tmp = node->value; tmp != NULL; tmp = tmp->next, index--) { - if (index == 0) - return tmp->data; + for (tmp = node->value; tmp != NULL; tmp = tmp->next) { + CONFIG_NODE *node = tmp->data; + + if (node->type != NODE_TYPE_COMMENT) { + if (index == 0) + return node; + index--; + } } return NULL; @@ -288,6 +293,8 @@ CONFIG_NODE *config_node_nth(CONFIG_NODE *node, int index) int config_node_index(CONFIG_NODE *parent, const char *key) { CONFIG_NODE *node; + GSList *tmp; + int index; g_return_val_if_fail(parent != NULL, -1); g_return_val_if_fail(key != NULL, -1); @@ -296,7 +303,18 @@ int config_node_index(CONFIG_NODE *parent, const char *key) if (node == NULL) return -1; - return g_slist_index(parent->value, node); + index = 0; + for (tmp = parent->value; tmp != NULL; tmp = tmp->next) { + CONFIG_NODE *tmpnode = tmp->data; + + if (tmpnode == node) + return index; + + if (tmpnode->type != NODE_TYPE_COMMENT) + index++; + } + + return -1; } /* Returns the first non-comment node in list */ |