Make unit_name_to_instance() return UnitNameFlags

The function returns non-negative UnitNameFlags on success, and negative
errno on error. In the past we kept the return type as int because of those
negative return values. But nowadays _UNIT_NAME_INVALID == -EINVAL. And if
we tried to actually return something that doesn't fit in the return type,
the compiler would throw an error. By changing to the "real" return type,
we allow the debugger to use symbolic representation for the variables.

diff --git a/src/basic/unit-file.c b/src/basic/unit-file.c
index ff8aa02d10996f8a5372e72365239f901b0041ab..fab63b6dcece9f1d55b0ffda1f9862c56b82f3e4 100644 (file)
--- a/src/basic/unit-file.c
+++ b/src/basic/unit-file.c
@@ -72,7 +72,7 @@ int unit_validate_alias_symlink_and_warn(const char *filename, const char *targe
         const char *src, *dst;
         _cleanup_free_ char *src_instance = NULL, *dst_instance = NULL;
         UnitType src_unit_type, dst_unit_type;
-        int src_name_type, dst_name_type;
+        UnitNameFlags src_name_type, dst_name_type;
 
         /* Check if the *alias* symlink is valid. This applies to symlinks like
          * /etc/systemd/system/dbus.service → dbus-broker.service, but not to .wants or .requires symlinks

diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
index 532f8fa048c1c5c32ae81754898fb44b75238410..dbc9f5baa26886cd320b4e61824cd7a12573796b 100644 (file)
--- a/src/basic/unit-name.c
+++ b/src/basic/unit-name.c
@@ -139,7 +139,7 @@ int unit_name_to_prefix(const char *n, char **ret) {
         return 0;
 }
 
-int unit_name_to_instance(const char *n, char **ret) {
+UnitNameFlags unit_name_to_instance(const char *n, char **ret) {
         const char *p, *d;
 
         assert(n);

diff --git a/src/basic/unit-name.h b/src/basic/unit-name.h
index 19d70abea8cc6b93c4d1a3089da1af3b424a1e63..f6af01c9bd8e8a3a1b4088d1c14a0c0efb685eea 100644 (file)
--- a/src/basic/unit-name.h
+++ b/src/basic/unit-name.h
@@ -22,8 +22,8 @@ bool unit_instance_is_valid(const char *i) _pure_;
 bool unit_suffix_is_valid(const char *s) _pure_;
 
 int unit_name_to_prefix(const char *n, char **ret);
-int unit_name_to_instance(const char *n, char **ret);
-static inline int unit_name_classify(const char *n) {
+UnitNameFlags unit_name_to_instance(const char *n, char **ret);
+static inline UnitNameFlags unit_name_classify(const char *n) {
         return unit_name_to_instance(n, NULL);
 }
 int unit_name_to_prefix_and_instance(const char *n, char **ret);

diff --git a/src/shared/install.c b/src/shared/install.c
index a8091cd0712e7dbe02eea08fd0e51ea59289d03e..3e9f6a3df309987fcb98fdfd3ed8ca27d7357aa0 100644 (file)
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1754,12 +1754,12 @@ int unit_file_verify_alias(const UnitFileInstallInfo *i, const char *dst, char *
                                                  "Invalid path \"%s\" in alias.", dir);
                 *p = '\0'; /* dir should now be a unit name */
 
-                r = unit_name_classify(dir);
-                if (r < 0)
+                UnitNameFlags type = unit_name_classify(dir);
+                if (type < 0)
                         return log_warning_errno(SYNTHETIC_ERRNO(EXDEV),
                                                  "Invalid unit name component \"%s\" in alias.", dir);
 
-                const bool instance_propagation = r == UNIT_NAME_TEMPLATE;
+                const bool instance_propagation = type == UNIT_NAME_TEMPLATE;
 
                 /* That's the name we want to use for verification. */
                 r = unit_symlink_name_compatible(path_alias, i->name, instance_propagation);
@@ -1776,11 +1776,11 @@ int unit_file_verify_alias(const UnitFileInstallInfo *i, const char *dst, char *
                 if (unit_name_is_valid(dst, UNIT_NAME_TEMPLATE)) {
                         _cleanup_free_ char *inst = NULL;
 
-                        r = unit_name_to_instance(i->name, &inst);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to extract instance name from %s: %m", i->name);
+                        UnitNameFlags type = unit_name_to_instance(i->name, &inst);
+                        if (type < 0)
+                                return log_error_errno(type, "Failed to extract instance name from %s: %m", i->name);
 
-                        if (r == UNIT_NAME_INSTANCE) {
+                        if (type == UNIT_NAME_INSTANCE) {
                                 r = unit_name_replace_instance(dst, inst, &dst_updated);
                                 if (r < 0)
                                         return log_error_errno(r, "Failed to build unit name from %s+%s: %m",

diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index ece78aa5486b21c2efe1ec028b3dd19f9b3ed22d..dc4dc7529d31b887ae5a07f7ab29787658962d3a 100644 (file)
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -471,8 +471,8 @@ static void test_build_parent_slice(void) {
 }
 
 static void test_unit_name_to_instance(void) {
+        UnitNameFlags r;
         char *instance;
-        int r;
 
         log_info("/* %s */", __func__);