SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udevadm-info: update error messages (#37619)

Browse Source
This commit is contained in:
Yu Watanabe
2025-05-27 10:08:24 +09:00
committed by GitHub
parent bdd852a199 a852f5c27d
commit 5c606fb33e
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udevadm-info.c
+4 -4
View File
@@ -1105,7 +1105,7 @@ static int parse_argv(int argc, char *argv[]) {
if (streq(optarg, "env")) /* deprecated */
arg_query = QUERY_PROPERTY;
else
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "unknown query type");
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown query type '%s'", optarg);
}
break;
@@ -1185,7 +1185,7 @@ static int parse_argv(int argc, char *argv[]) {
case ARG_ATTR_MATCH:
if (!strchr(optarg, '='))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"expect <ATTR>=<value> instead of '%s'", optarg);
"Expected <ATTR>=<value> instead of '%s'", optarg);
r = strv_extend(&arg_attr_match, optarg);
if (r < 0)
@@ -1195,7 +1195,7 @@ static int parse_argv(int argc, char *argv[]) {
case ARG_ATTR_NOMATCH:
if (!strchr(optarg, '='))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"expect <ATTR>=<value> instead of '%s'", optarg);
"Expected <ATTR>=<value> instead of '%s'", optarg);
r = strv_extend(&arg_attr_nomatch, optarg);
if (r < 0)
@@ -1205,7 +1205,7 @@ static int parse_argv(int argc, char *argv[]) {
case ARG_PROPERTY_MATCH:
if (!strchr(optarg, '='))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"expect <PROPERTY>=<value> instead of '%s'", optarg);
"Expected <PROPERTY>=<value> instead of '%s'", optarg);
r = strv_extend(&arg_property_match, optarg);
if (r < 0)
src/udev/udevadm-util.c
+4 -3
View File
@@ -152,8 +152,9 @@ int parse_resolve_name_timing(const char *str, ResolveNameTiming *ret) {
return 1;
}
int parse_key_value_argument(const char *s, bool require_value, char **key, char **value) {
int parse_key_value_argument(const char *str, bool require_value, char **key, char **value) {
_cleanup_free_ char *k = NULL, *v = NULL;
const char *s = str;
int r;
assert(s);
@@ -162,9 +163,9 @@ int parse_key_value_argument(const char *s, bool require_value, char **key, char
r = extract_many_words(&s, "=", EXTRACT_DONT_COALESCE_SEPARATORS, &k, &v);
if (r < 0)
return log_error_errno(r, "Failed to parse key/value pair %s: %m", s);
return log_error_errno(r, "Failed to parse key/value pair %s: %m", str);
if (require_value && r < 2)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Missing '=' in key/value pair %s.", s);
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Missing '=' in key/value pair %s.", str);
if (!filename_is_valid(k))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "%s is not a valid key name", k);
src/udev/udevadm-util.h
+1 -1
View File
@@ -10,6 +10,6 @@ int find_device(const char *id, const char *prefix, sd_device **ret);
int find_device_with_action(const char *id, sd_device_action_t action, sd_device **ret);
int parse_device_action(const char *str, sd_device_action_t *ret);
int parse_resolve_name_timing(const char *str, ResolveNameTiming *ret);
int parse_key_value_argument(const char *s, bool require_value, char **key, char **value);
int parse_key_value_argument(const char *str, bool require_value, char **key, char **value);
int udev_ping(usec_t timeout, bool ignore_connection_failure);
int search_rules_files(char * const *a, const char *root, char ***ret);