a142c87042
gcc has a new warning which caught a bug of int/enum mismatches. And we would crash on some architectures when built with -D_FORTIFY_SOURCE=3 because of our malloc_usable_size() use. This should resolve the build failure in F38 mass build.
38 lines
1.9 KiB
Diff
38 lines
1.9 KiB
Diff
From 2fdd12acd5c69bc952d9ca4d5ad796e6e830d21b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crodriguez@owncloud.com>
|
|
Date: Fri, 11 Nov 2022 15:34:32 +0000
|
|
Subject: [PATCH 1/5] shared|install: Use InstallChangeType consistently
|
|
|
|
gcc 13 -Wenum-int-mismatch, enabled by default, reminds us enum ! = int
|
|
|
|
(cherry picked from commit 9264db1a0ac6034ab5b40ef3f5914d8dc7d77aba)
|
|
---
|
|
src/shared/install.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/shared/install.h b/src/shared/install.h
|
|
index 9bb412ba06..0abc73897e 100644
|
|
--- a/src/shared/install.h
|
|
+++ b/src/shared/install.h
|
|
@@ -197,7 +197,7 @@ int unit_file_exists(LookupScope scope, const LookupPaths *paths, const char *na
|
|
int unit_file_get_list(LookupScope scope, const char *root_dir, Hashmap *h, char **states, char **patterns);
|
|
Hashmap* unit_file_list_free(Hashmap *h);
|
|
|
|
-InstallChangeType install_changes_add(InstallChange **changes, size_t *n_changes, int type, const char *path, const char *source);
|
|
+InstallChangeType install_changes_add(InstallChange **changes, size_t *n_changes, InstallChangeType type, const char *path, const char *source);
|
|
void install_changes_free(InstallChange *changes, size_t n_changes);
|
|
void install_changes_dump(int r, const char *verb, const InstallChange *changes, size_t n_changes, bool quiet);
|
|
|
|
@@ -224,7 +224,7 @@ UnitFileState unit_file_state_from_string(const char *s) _pure_;
|
|
/* from_string conversion is unreliable because of the overlap between -EPERM and -1 for error. */
|
|
|
|
const char *install_change_type_to_string(InstallChangeType t) _const_;
|
|
-int install_change_type_from_string(const char *s) _pure_;
|
|
+InstallChangeType install_change_type_from_string(const char *s) _pure_;
|
|
|
|
const char *unit_file_preset_mode_to_string(UnitFilePresetMode m) _const_;
|
|
UnitFilePresetMode unit_file_preset_mode_from_string(const char *s) _pure_;
|
|
--
|
|
2.39.1
|
|
|