Changeset e1e4192 in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2012-06-03T20:45:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

90478727

Parents:

f7e69f5 (diff), 3123d2a (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/vfs/vfs.c (modified) (5 diffs)

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;