Changeset 99c2c69e in mainline for uspace/srv/locsrv/category.c

Timestamp:

2013-09-13T00:36:30Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (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:

mainline changes

File:

• uspace/srv/locsrv/category.c (modified) (5 diffs)

uspace/srv/locsrv/category.c

@@ -73 +73 @@
 
         size_t pos = 0;
-        list_foreach(cdir->categories, item) {
-                category_t *cat =
-                    list_get_instance(item, category_t, cat_list);
-
+        list_foreach(cdir->categories, cat_list, category_t, cat) {
                 if (pos < buf_cnt)
                         id_buf[pos] = cat->id;
@@ -116 +113 @@
 
         /* Verify that category does not contain this service yet. */
-        list_foreach(cat->svc_memb, item) {
-                svc_categ_t *memb = list_get_instance(item, svc_categ_t,
-                    cat_link);
+        list_foreach(cat->svc_memb, cat_link, svc_categ_t, memb) {
                 if (memb->svc == svc) {
                         return EEXIST;
@@ -154 +149 @@
         assert(fibril_mutex_is_locked(&cdir->mutex));
 
-        list_foreach(cdir->categories, item) {
-                category_t *cat = list_get_instance(item, category_t,
-                    cat_list);
+        list_foreach(cdir->categories, cat_list, category_t, cat) {
                 if (cat->id == catid)
                         return cat;
@@ -169 +162 @@
         assert(fibril_mutex_is_locked(&cdir->mutex));
 
-        list_foreach(cdir->categories, item) {
-                category_t *cat = list_get_instance(item, category_t,
-                    cat_list);
+        list_foreach(cdir->categories, cat_list, category_t, cat) {
                 if (str_cmp(cat->name, name) == 0)
                         return cat;
@@ -197 +188 @@
 
         size_t pos = 0;
-        list_foreach(cat->svc_memb, item) {
-                svc_categ_t *memb =
-                    list_get_instance(item, svc_categ_t, cat_link);
-
+        list_foreach(cat->svc_memb, cat_link, svc_categ_t, memb) {
                 if (pos < buf_cnt)
                         id_buf[pos] = memb->svc->id;