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

udevadm: use SYNTHETIC_ERRNO() macro

Browse Source
This commit is contained in:
Yu Watanabe
2019-01-13 07:37:49 +09:00
parent cf7f501353
commit 47c8fcbeb7
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udevadm-control.c
+3 -4
View File
@@ -116,10 +116,9 @@ int control_main(int argc, char *argv[], void *userdata) {
return r;
break;
case 'p':
if (!strchr(optarg, '=')) {
log_error("expect <KEY>=<value> instead of '%s'", optarg);
return -EINVAL;
}
if (!strchr(optarg, '='))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "expect <KEY>=<value> instead of '%s'", optarg);
r = udev_ctrl_send_set_env(uctrl, optarg, timeout);
if (r < 0)
return r;
src/udev/udevadm-info.c
+2 -4
View File
@@ -387,10 +387,8 @@ int info_main(int argc, char *argv[], void *userdata) {
query = QUERY_PATH;
else if (streq(optarg, "all"))
query = QUERY_ALL;
else {
log_error("unknown query type");
return -EINVAL;
}
else
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "unknown query type");
break;
case 'r':
arg_root = true;
src/udev/udevadm-trigger.c
+4 -8
View File
@@ -188,18 +188,14 @@ int trigger_main(int argc, char *argv[], void *userdata) {
device_type = TYPE_DEVICES;
else if (streq(optarg, "subsystems"))
device_type = TYPE_SUBSYSTEMS;
else {
log_error("Unknown type --type=%s", optarg);
return -EINVAL;
}
else
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown type --type=%s", optarg);
break;
case 'c':
if (STR_IN_SET(optarg, "add", "remove", "change"))
action = optarg;
else {
log_error("Unknown action '%s'", optarg);
return -EINVAL;
}
else
log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown action '%s'", optarg);
break;
case 's':