Changeset 99c2c69e in mainline for uspace/srv/locsrv/locsrv.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/locsrv.c (modified) (7 diffs)

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;