Changes in uspace/srv/bd/file_bd/file_bd.c [b16e77d:9d58539] in mainline

File:

• uspace/srv/bd/file_bd/file_bd.c (modified) (2 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -119 +119 @@
         rc = loc_service_register(device_name, &service_id);
         if (rc != EOK) {
-                printf("%s: Unable to register device '%s'.\n",
-                    NAME, device_name);
+                printf(NAME ": Unable to register device '%s'.\n",
+                        device_name);
                 return rc;
         }
-        
-        printf("%s: Accepting connections\n", NAME);
+
+        printf(NAME ": Accepting connections\n");
         task_retval(0);
         async_manager();
-        
+
         /* Not reached */
         return 0;
@@ -139 +139 @@
 static int file_bd_init(const char *fname)
 {
+        int rc;
+        long img_size;
+        
         async_set_client_connection(file_bd_connection);
-        int rc = loc_server_register(NAME);
-        if (rc != EOK) {
-                printf("%s: Unable to register driver.\n", NAME);
+        rc = loc_server_register(NAME);
+        if (rc < 0) {
+                printf(NAME ": Unable to register driver.\n");
                 return rc;
         }
-        
+
         img = fopen(fname, "rb+");
         if (img == NULL)
                 return EINVAL;
-        
+
         if (fseek(img, 0, SEEK_END) != 0) {
                 fclose(img);
                 return EIO;
         }
-        
-        off64_t img_size = ftell(img);
+
+        img_size = ftell(img);
         if (img_size < 0) {
                 fclose(img);
                 return EIO;
         }
-        
+
         num_blocks = img_size / block_size;
-        
+
         fibril_mutex_initialize(&dev_lock);
-        
+
         return EOK;
 }