Changeset cf22ada in mainline for uspace/srv/loc/category.h

Timestamp:

2011-08-18T20:26:32Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

107f2e0

Parents:

f55b12b (diff), ef7052ec (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/category.h (modified) (3 diffs)

uspace/srv/loc/category.h

@@ -55 +55 @@
         link_t cat_list;
 
-        /** List of services in this category (loc_service_t) */
-        list_t services;
+        /** List of service memberships in this category (svc_categ_t) */
+        list_t svc_memb;
 } category_t;
 
@@ -67 +67 @@
 } categ_dir_t;
 
+/** Service in category membership. */
+typedef struct {
+        /** Link to category_t.svc_memb list */
+        link_t cat_link;
+        /** Link to loc_service_t.cat_memb list */
+        link_t svc_link;
+        
+        /** Category */
+        category_t *cat;
+        /** Service */
+        loc_service_t *svc;
+} svc_categ_t;
+
 extern void categ_dir_init(categ_dir_t *);
 extern void categ_dir_add_cat(categ_dir_t *, category_t *);
@@ -73 +86 @@
 extern category_t *category_new(const char *);
 extern int category_add_service(category_t *, loc_service_t *);
+extern void category_remove_service(svc_categ_t *);
 extern category_t *category_get(categ_dir_t *, catid_t);
 extern category_t *category_find_by_name(categ_dir_t *, const char *);