sysupdate: some smaller clean-ups

Nothing earth shattering, just some minor tweaks.

diff --git a/src/sysupdate/sysupdate-forward.h b/src/sysupdate/sysupdate-forward.h
index a8659d756b2cd2e3feb260e70b7091aad9bf6c5f..f32cb55d32b5d2f219b2c17feb7f4df4d30f0a4f 100644 (file)
--- a/src/sysupdate/sysupdate-forward.h
+++ b/src/sysupdate/sysupdate-forward.h
@@ -6,7 +6,9 @@
 #include "shared-forward.h" /* IWYU pragma: export */
 
 typedef struct Context Context;
-typedef struct PartitionInfo PartitionInfo;
-typedef struct Resource Resource;
 typedef struct Instance Instance;
 typedef struct InstanceMetadata InstanceMetadata;
+typedef struct PartitionInfo PartitionInfo;
+typedef struct Resource Resource;
+typedef struct Transfer Transfer;
+typedef struct UpdateSet UpdateSet;

diff --git a/src/sysupdate/sysupdate-pattern.c b/src/sysupdate/sysupdate-pattern.c
index e1cc3dc466cdb11dbfbacf5dac9b836729846ebf..f06265c698fa124dad265af9128f8c3ac2f04934 100644 (file)
--- a/src/sysupdate/sysupdate-pattern.c
+++ b/src/sysupdate/sysupdate-pattern.c
@@ -458,7 +458,7 @@ int pattern_match_many(char **patterns, const char *s, InstanceMetadata *ret) {
                 r = pattern_match(*p, s, &found);
                 if (r < 0)
                         return r;
-                if (r > 0) {
+                if (r != PATTERN_MATCH_NO) {
                         if (ret) {
                                 *ret = found;
                                 found = (InstanceMetadata) INSTANCE_METADATA_NULL;

diff --git a/src/sysupdate/sysupdate-resource.c b/src/sysupdate/sysupdate-resource.c
index abc63960df2bb6aaf62a473f8e8102b7097b12c7..275d8d7c15e0465cad5bff5910b2211f9edab5bd 100644 (file)
--- a/src/sysupdate/sysupdate-resource.c
+++ b/src/sysupdate/sysupdate-resource.c
@@ -158,6 +158,8 @@ static int resource_load_from_directory_recursive(
                         return log_oom();
 
                 r = pattern_match_many(rr->patterns, rel_joined_for_matching, &extracted_fields);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to match pattern: %m");
                 if (r == PATTERN_MATCH_RETRY) {
                         _cleanup_closedir_ DIR *subdir = NULL;
 
@@ -170,10 +172,7 @@ static int resource_load_from_directory_recursive(
                                 return r;
                         if (r == 0)
                                 continue;
-                }
-                else if (r < 0)
-                        return log_error_errno(r, "Failed to match pattern: %m");
-                else if (r == PATTERN_MATCH_NO)
+                } else if (r == PATTERN_MATCH_NO)
                         continue;
 
                 if (de->d_type == DT_DIR && m != S_IFDIR)