Changeset 0c2d9bb in mainline for uspace/lib/c/generic/cfg.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/lib/c/generic/cfg.c (modified) (3 diffs)

uspace/lib/c/generic/cfg.c

@@ -83 +83 @@
                 return true;
         
-        list_foreach(data->sections, link) {
-                const cfg_section_t *section = cfg_section_instance(link);
-                
+        cfg_file_foreach(data, section) {
                 if (!list_empty(&section->entries))
                         return false;
@@ -413 +411 @@
 const cfg_section_t *cfg_find_section(const cfg_file_t *data, const char *title)
 {
-        list_foreach(data->sections, link) {
-                const cfg_section_t *section = cfg_section_instance(link);
-                
+        cfg_file_foreach(data, section) {
                 if (str_cmp(section->title, title) == 0)
                         return section;
@@ -434 +430 @@
 const char *cfg_find_value(const cfg_section_t *section, const char *key)
 {
-        list_foreach(section->entries, link) {
-                const cfg_entry_t *entry = cfg_entry_instance(link);
-                
+        cfg_section_foreach(section, entry) {
                 if (str_cmp(entry->key, key) == 0)
                         return entry->value;