Changeset 88ad75f in mainline for uspace/srv/sysman/units/unit_cfg.c

Timestamp:

2020-01-09T01:04:57Z (4 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

76c8209

Parents:

0939097

git-author:

Matthieu Riolo <matthieu.riolo@…> (2020-01-05 19:24:23)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-01-09 01:04:57)

Message:

repo_add_unit() returned an errno_t but it was never handled. This
commit adds a check if EOK is returned or else the repo will be left
unchanged

File:

• uspace/srv/sysman/units/unit_cfg.c (modified) (3 diffs)

uspace/srv/sysman/units/unit_cfg.c

@@ -155 +155 @@
         DIR *dir;
         struct dirent *de;
+        errno_t rc;
 
         dir = opendir(path);
@@ -167 +168 @@
         while ((de = readdir(dir))) {
                 unit_t *unit = NULL;
-                errno_t rc = cfg_parse_file(path, de->d_name, &unit);
+                rc = cfg_parse_file(path, de->d_name, &unit);
                 if (rc != EOK) {
                         sysman_log(LVL_WARN, "Cannot load unit from file %s/%s",
@@ -179 +180 @@
 
                 assert(unit->repo_state == REPO_EMBRYO);
-                repo_add_unit(unit);
+                rc = repo_add_unit(unit);
+                if (rc != EOK)
+                        goto error;
+
         }
         closedir(dir);
 
-        errno_t rc = repo_resolve_references();
-        if (rc != EOK) {
-                repo_rollback();
-                return rc;
-        }
+        rc = repo_resolve_references();
+        if (rc != EOK)
+                goto error;
 
         repo_commit();
         return EOK;
+
+error:
+        repo_rollback();
+        return rc;
 }