Changeset 1c6c3e1d in mainline for uspace/srv/bd/file_bd/file_bd.c

Timestamp:

2023-10-22T17:55:33Z (21 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (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 branch 'master' into ticket

File:

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

uspace/srv/bd/file_bd/file_bd.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -61 +61 @@
 static aoff64_t num_blocks;
 static FILE *img;
+static loc_srv_t *srv;
 
 static service_id_t service_id;
@@ -137 +138 @@
                 return -1;
 
-        rc = loc_service_register(device_name, &service_id);
+        rc = loc_service_register(srv, device_name, &service_id);
         if (rc != EOK) {
                 printf("%s: Unable to register device '%s': %s.\n",
@@ -150 +151 @@
         }
 
-        rc = loc_service_add_to_cat(service_id, disk_cat);
+        rc = loc_service_add_to_cat(srv, service_id, disk_cat);
         if (rc != EOK) {
                 printf("%s: Failed adding %s to category: %s",
@@ -176 +177 @@
 
         async_set_fallback_port_handler(file_bd_connection, NULL);
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf("%s: Unable to register driver.\n", NAME);
@@ -183 +184 @@
 
         img = fopen(fname, "rb+");
-        if (img == NULL)
-                return EINVAL;
+        if (img == NULL) {
+                rc = EINVAL;
+                goto error;
+        }
 
         if (fseek(img, 0, SEEK_END) != 0) {
-                fclose(img);
-                return EIO;
+                rc = EIO;
+                goto error;
         }
 
         off64_t img_size = ftell(img);
         if (img_size < 0) {
+                rc = EIO;
+                goto error;
+        }
+
+        num_blocks = img_size / block_size;
+
+        fibril_mutex_initialize(&dev_lock);
+
+        return EOK;
+error:
+        if (img != NULL) {
                 fclose(img);
-                return EIO;
-        }
-
-        num_blocks = img_size / block_size;
-
-        fibril_mutex_initialize(&dev_lock);
-
-        return EOK;
+                img = NULL;
+        }
+
+        if (srv != NULL) {
+                loc_server_unregister(srv);
+                srv = NULL;
+        }
+
+        return rc;
 }