Changes in uspace/srv/locsrv/category.c [feeac0d:32d96e1] in mainline

File:

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

uspace/srv/locsrv/category.c

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