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

Timestamp:

2011-09-07T00:03:26Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

5081276

Parents:

bb74dabe (diff), 038b289 (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 mainline changes.

File:

• uspace/srv/loc/loc.c (modified) (2 diffs)

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);
@@ -1270 +1277 @@
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("test3");
+        categ_dir_add_cat(&cdir, cat);
+
         cat = category_new("usbhc");
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("virt-null");
+        categ_dir_add_cat(&cdir, cat);
+
         cat = category_new("virtual");
         categ_dir_add_cat(&cdir, cat);
+
 
         return true;