Changes in uspace/srv/vfs/vfs.c [fbcdeb8:3e6a98c5] in mainline

File:

• uspace/srv/vfs/vfs.c (modified) (6 diffs)

uspace/srv/vfs/vfs.c

@@ -44 +44 @@
 #include <errno.h>
 #include <stdio.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <str.h>
 #include <as.h>
@@ -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;
         }
@@ -172 +173 @@
          * Allocate and initialize the Path Lookup Buffer.
          */
-        plb = as_area_create((void *) -1, PLB_SIZE,
+        plb = as_area_create(AS_AREA_ANY, PLB_SIZE,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
-        if (plb == (void *) -1) {
-                printf(NAME ": Cannot create address space area\n");
+        if (plb == AS_MAP_FAILED) {
+                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;