Changeset feeac0d in mainline for uspace/srv/locsrv

Timestamp:

2013-09-10T16:32:35Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4982d87

Parents:

e8d6ce2

Message:

Simplify use of list_foreach.

Location:

uspace/srv/locsrv

Files:

• category.c (modified) (5 diffs)
• locsrv.c (modified) (7 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;

uspace/srv/locsrv/locsrv.c

@@ -184 +184 @@
         assert(fibril_mutex_is_locked(&services_list_mutex));
         
-        list_foreach(namespaces_list, item) {
-                loc_namespace_t *namespace =
-                    list_get_instance(item, loc_namespace_t, namespaces);
+        list_foreach(namespaces_list, namespaces, loc_namespace_t, namespace) {
                 if (str_cmp(namespace->name, name) == 0)
                         return namespace;
@@ -203 +201 @@
         assert(fibril_mutex_is_locked(&services_list_mutex));
         
-        list_foreach(namespaces_list, item) {
-                loc_namespace_t *namespace =
-                    list_get_instance(item, loc_namespace_t, namespaces);
+        list_foreach(namespaces_list, namespaces, loc_namespace_t, namespace) {
                 if (namespace->id == id)
                         return namespace;
@@ -219 +215 @@
         assert(fibril_mutex_is_locked(&services_list_mutex));
         
-        list_foreach(services_list, item) {
-                loc_service_t *service =
-                    list_get_instance(item, loc_service_t, services);
+        list_foreach(services_list, services, loc_service_t, service) {
                 if ((str_cmp(service->namespace->name, ns_name) == 0)
                     && (str_cmp(service->name, name) == 0))
@@ -239 +233 @@
         assert(fibril_mutex_is_locked(&services_list_mutex));
         
-        list_foreach(services_list, item) {
-                loc_service_t *service =
-                    list_get_instance(item, loc_service_t, services);
+        list_foreach(services_list, services, loc_service_t, service) {
                 if (service->id == id)
                         return service;
@@ -889 +881 @@
         fibril_mutex_lock(&callback_sess_mutex);
         
-        list_foreach(callback_sess_list, link) {
-                cb_sess_t *cb_sess;
-                
-                cb_sess = list_get_instance(link, cb_sess_t, cb_sess_list);
-                
+        list_foreach(callback_sess_list, cb_sess_list, cb_sess_t, cb_sess) {
                 async_exch_t *exch = async_exchange_begin(cb_sess->sess);
                 async_msg_0(exch, LOC_EVENT_CAT_CHANGE);
@@ -1050 +1038 @@
         
         size_t pos = 0;
-        list_foreach(namespaces_list, item) {
-                loc_namespace_t *namespace =
-                    list_get_instance(item, loc_namespace_t, namespaces);
-                
+        list_foreach(namespaces_list, namespaces, loc_namespace_t, namespace) {
                 desc[pos].id = namespace->id;
                 str_cpy(desc[pos].name, LOC_NAME_MAXLEN, namespace->name);
@@ -1114 +1099 @@
         
         size_t pos = 0;
-        list_foreach(services_list, item) {
-                loc_service_t *service =
-                    list_get_instance(item, loc_service_t, services);
-                
+        list_foreach(services_list, services, loc_service_t, service) {
                 if (service->namespace == namespace) {
                         desc[pos].id = service->id;