Changeset 1dc4a5e in mainline for uspace/srv/devman/main.c

Timestamp:

2011-08-18T13:34:33Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

763e0cd

Parents:

99ac5cf

Message:

Renaming to reflect classes are gone.

File:

• uspace/srv/devman/main.c (modified) (4 diffs)

uspace/srv/devman/main.c

@@ -332 +332 @@
 }
 
-static void devman_add_function_to_class(ipc_callid_t callid, ipc_call_t *call)
+static void devman_add_function_to_cat(ipc_callid_t callid, ipc_call_t *call)
 {
         devman_handle_t handle = IPC_GET_ARG1(*call);
@@ -338 +338 @@
         int rc;
         
-        /* Get class name. */
-        char *class_name;
-        rc = async_data_write_accept((void **) &class_name, true,
+        /* Get category name. */
+        char *cat_name;
+        rc = async_data_write_accept((void **) &cat_name, true,
             0, 0, 0, 0);
         if (rc != EOK) {
@@ -353 +353 @@
         }
         
-        rc = loc_category_get_id(class_name, &cat_id, IPC_FLAG_BLOCKING);
+        rc = loc_category_get_id(cat_name, &cat_id, IPC_FLAG_BLOCKING);
         if (rc == EOK) {
                 loc_service_add_to_cat(fun->service_id, cat_id);
         } else {
                 log_msg(LVL_ERROR, "Failed adding function `%s' to category "
-                    "`%s'.", fun->pathname, class_name);
-        }
-        
-        log_msg(LVL_NOTE, "Function `%s' added to class `%s'.",
-            fun->pathname, class_name);
+                    "`%s'.", fun->pathname, cat_name);
+        }
+        
+        log_msg(LVL_NOTE, "Function `%s' added to category `%s'.",
+            fun->pathname, cat_name);
 
         async_answer_0(callid, EOK);
@@ -416 +416 @@
                         devman_add_function(callid, &call);
                         break;
-                case DEVMAN_ADD_DEVICE_TO_CLASS:
-                        devman_add_function_to_class(callid, &call);
+                case DEVMAN_ADD_DEVICE_TO_CATEGORY:
+                        devman_add_function_to_cat(callid, &call);
                         break;
                 default: