Changeset ca95ccd in mainline

Timestamp:

2024-08-22T20:46:18Z (3 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

9546146

Parents:

cde067e

Message:

Fix file closing, volume config sync.

Location:

uspace

Files:

• app/sysinst/sysinst.c (modified) (1 diff)
• lib/sif/src/sif.c (modified) (4 diffs)
• srv/volsrv/volume.c (modified) (1 diff)

uspace/app/sysinst/sysinst.c

@@ -309 +309 @@
         }
 
+        rc = vol_volumes_sync(volumes);
+        if (rc != EOK) {
+                printf("Error saving volume confiuration.\n");
+                goto error;
+        }
+
         printf("Configuring volume server: delete reference\n");
         vol_volume_del_ref(volume);

uspace/lib/sif/src/sif.c

@@ -228 +228 @@
         errno_t rc;
         bool endtag;
-        FILE *f;
+        FILE *f = NULL;
 
         doc = calloc(1, sizeof(sif_doc_t));
@@ -255 +255 @@
         }
 
+        fclose(f);
         doc->root = root;
         *rdoc = doc;
@@ -261 +262 @@
         sif_node_delete(root);
         free(doc);
+        if (f != NULL)
+                fclose(f);
         return rc;
 }
@@ -372 +375 @@
         }
 
+        fclose(f);
         return EOK;
 error:

uspace/srv/volsrv/volume.c

@@ -577 +577 @@
                 if (vol_volume_is_persist(volume)) {
                         /* Create 'volume' node. */
-                        rc = sif_node_append_child(rnode, "volume", &node);
+                        rc = sif_node_append_child(nvolumes, "volume", &node);
                         if (rc != EOK)
                                 goto error;