Changeset a1b7e80 in mainline for uspace/srv/loc/loc.c

Timestamp:

2011-09-02T16:54:18Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f480d7e

Parents:

7a72ce1a (diff), 224c0e7 (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:

Merge basic infrastructure for anticipated device removal from
lp:~jsvoboda/helenos/devrem

File:

• uspace/srv/loc/loc.c (modified) (1 diff)

uspace/srv/loc/loc.c

@@ -1231 +1231 @@
         svc = loc_service_find_id(svc_id);
         
+        if (cat == NULL || svc == NULL) {
+                fibril_mutex_unlock(&cdir.mutex);
+                fibril_mutex_unlock(&services_list_mutex);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
         fibril_mutex_lock(&cat->mutex);
         retval = category_add_service(cat, svc);