Changeset e6a78b9 in mainline for uspace/srv/bd/file_bd/file_bd.c

Timestamp:

2012-06-29T15:31:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (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/bd/file_bd/file_bd.c (modified) (3 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -119 +119 @@
         rc = loc_service_register(device_name, &service_id);
         if (rc != EOK) {
-                printf(NAME ": Unable to register device '%s'.\n",
-                        device_name);
+                printf("%s: Unable to register device '%s'.\n",
+                    NAME, device_name);
                 return rc;
         }
-
-        printf(NAME ": Accepting connections\n");
+        
+        printf("%s: Accepting connections\n", NAME);
         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);
-        rc = loc_server_register(NAME);
-        if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
+        int rc = loc_server_register(NAME);
+        if (rc != EOK) {
+                printf("%s: Unable to register driver.\n", NAME);
                 return rc;
         }
-
+        
         img = fopen(fname, "rb+");
         if (img == NULL)
                 return EINVAL;
-
+        
         if (fseek(img, 0, SEEK_END) != 0) {
                 fclose(img);
                 return EIO;
         }
-
-        img_size = ftell(img);
+        
+        off64_t 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;
 }
@@ -192 +189 @@
 
         (void) async_share_out_finalize(callid, &fs_va);
-        if (fs_va == (void *) -1) {
+        if (fs_va == AS_MAP_FAILED) {
                 async_answer_0(callid, EHANGUP);
                 return;