Changes in uspace/srv/locsrv/locsrv.c [feeac0d:3e6a98c5] in mainline

File:

• uspace/srv/locsrv/locsrv.c (modified) (8 diffs)

uspace/srv/locsrv/locsrv.c

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