Changeset 241f1985 in mainline for uspace/srv/sysman/units/unit_cfg.c

Timestamp:

2019-08-31T10:45:17Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

File:

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

uspace/srv/sysman/units/unit_cfg.c

@@ -55 +55 @@
  * @param[out]  unit_ptr   Unit loaded from the file. Undefined when function fails.
  */
-static int cfg_parse_file(const char *dirname, const char *filename,
+static errno_t cfg_parse_file(const char *dirname, const char *filename,
     unit_t **unit_ptr)
 {
-        int rc = EOK;
+        errno_t rc = EOK;
         unit_t *new_unit = NULL;
         char *fn = NULL;
@@ -86 +86 @@
         if (u != NULL) {
                 // TODO allow updating configuration of existing unit
-                rc = EEXISTS;
+                rc = EEXIST;
                 goto finish;
         } else {
@@ -136 +136 @@
         list_foreach(text_parse.errors, link, text_parse_error_t, err) {
                 sysman_log(LVL_WARN,
-                    "Error (%i) when parsing '%s' on line %i.",
+                    "Error (%i) when parsing '%s' on line %lu.",
                     err->parse_errno, fn, err->lineno);
         }
@@ -151 +151 @@
 }
 
-static int cfg_load_configuration(const char *path)
+static errno_t cfg_load_configuration(const char *path)
 {
         DIR *dir;
@@ -167 +167 @@
         while ((de = readdir(dir))) {
                 unit_t *unit = NULL;
-                int rc = cfg_parse_file(path, de->d_name, &unit);
+                errno_t rc = cfg_parse_file(path, de->d_name, &unit);
                 if (rc != EOK) {
                         sysman_log(LVL_WARN, "Cannot load unit from file %s/%s",
@@ -183 +183 @@
         closedir(dir);
 
-        int rc = repo_resolve_references();
+        errno_t rc = repo_resolve_references();
         if (rc != EOK) {
                 repo_rollback();
@@ -207 +207 @@
 }
 
-static int unit_cfg_load(unit_t *unit, ini_configuration_t *ini_conf,
+static errno_t unit_cfg_load(unit_t *unit, ini_configuration_t *ini_conf,
     text_parse_t *text_parse)
 {
@@ -225 +225 @@
 }
 
-static int unit_cfg_start(unit_t *unit)
-{
-        unit_cfg_t *u_cfg = CAST_CFG(unit);
-        assert(u_cfg);
-
-        int rc = cfg_load_configuration(u_cfg->path);
+static errno_t unit_cfg_start(unit_t *unit)
+{
+        unit_cfg_t *u_cfg = CAST_CFG(unit);
+        assert(u_cfg);
+
+        errno_t rc = cfg_load_configuration(u_cfg->path);
         
         if (rc == EOK) {
@@ -241 +241 @@
 }
 
-static int unit_cfg_stop(unit_t *unit)
+static errno_t unit_cfg_stop(unit_t *unit)
 {
         unit_cfg_t *u_cfg = CAST_CFG(unit);