Changeset a47f522 in mainline

Timestamp:

2012-06-01T19:09:51Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1038a9c

Parents:

d92c1ca

Message:

trivial changes (error code reporting, messages)

Location:

uspace/srv

Files:

• clipboard/clipboard.c (modified) (1 diff)
• hid/fb/fb.c (modified) (1 diff)
• ns/ns.c (modified) (1 diff)
• vfs/vfs.c (modified) (5 diffs)

uspace/srv/clipboard/clipboard.c

@@ -181 +181 @@
         
         async_set_client_connection(clip_connection);
-        
-        if (service_register(SERVICE_CLIPBOARD) != EOK)
-                return -1;
+        int rc = service_register(SERVICE_CLIPBOARD);
+        if (rc != EOK)
+                return rc;
         
         printf("%s: Accepting connections\n", NAME);

uspace/srv/hid/fb/fb.c

@@ -990 +990 @@
         int rc = loc_server_register(NAME);
         if (rc != EOK) {
-                printf("%s: Unable to register driver (%d)\n", NAME, rc);
-                return 1;
+                printf("%s: Unable to register driver\n", NAME);
+                return rc;
         }
         

uspace/srv/ns/ns.c

@@ -48 +48 @@
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS IPC Naming Service\n");
+        printf("%s: HelenOS IPC Naming Service\n", NAME);
         
         int rc = service_init();

uspace/srv/vfs/vfs.c

@@ -159 +159 @@
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS VFS server\n");
+        printf("%s: HelenOS VFS server\n", NAME);
         
         /*
@@ -165 +165 @@
          */
         if (!vfs_nodes_init()) {
-                printf(NAME ": Failed to initialize VFS node hash table\n");
+                printf("%s: Failed to initialize VFS node hash table\n",
+                    NAME);
                 return ENOMEM;
         }
@@ -175 +176 @@
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
         if (plb == (void *) -1) {
-                printf(NAME ": Cannot create address space area\n");
+                printf("%s: Cannot create address space area\n", NAME);
                 return ENOMEM;
         }
@@ -196 +197 @@
         async_set_interrupt_received(notification_received);
         event_task_subscribe(EVENT_TASK_STATE_CHANGE, VFS_TASK_STATE_CHANGE);
-
+        
         /*
          * Register at the naming service.
          */
-        if (service_register(SERVICE_VFS) != EOK) {
+        int rc = service_register(SERVICE_VFS);
+        if (rc != EOK) {
                 printf("%s: Cannot register VFS service\n", NAME);
-                return EINVAL;
+                return rc;
         }
         
@@ -208 +210 @@
          * Start accepting connections.
          */
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
         async_manager();
         return 0;