shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 09:21:26 +03:00
Code

Merge pull request #11409 from yuwata/udev-synthetic-errno

Browse Source 
udev: update logs
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-01-13 11:11:22 +01:00 committed by GitHub
commit 0d432661fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/udev/udev-builtin-blkid.c
View File

@ -240,7 +240,7 @@ static int builtin_blkid(sd_device *dev, int argc, char *argv[], bool test) {
if (r < 0) if (r < 0)
return log_device_error_errno(dev, r, "Failed to parse '%s' as an integer: %m", optarg); return log_device_error_errno(dev, r, "Failed to parse '%s' as an integer: %m", optarg);
if (offset < 0) if (offset < 0)
return log_device_error_errno(dev, -ERANGE, "Invalid offset %"PRIi64": %m", offset); return log_device_error_errno(dev, SYNTHETIC_ERRNO(ERANGE), "Invalid offset %"PRIi64": %m", offset);
break; break;
case 'R': case 'R':
noraid = true; noraid = true;

2
src/udev/udev-builtin-btrfs.c
View File

@ -18,7 +18,7 @@ static int builtin_btrfs(sd_device *dev, int argc, char *argv[], bool test) {
int r; int r;
if (argc != 3 || !streq(argv[1], "ready")) if (argc != 3 || !streq(argv[1], "ready"))
return log_device_error_errno(dev, EINVAL, "Invalid arguments"); return log_device_error_errno(dev, SYNTHETIC_ERRNO(EINVAL), "Invalid arguments");
fd = open("/dev/btrfs-control", O_RDWR|O_CLOEXEC); fd = open("/dev/btrfs-control", O_RDWR|O_CLOEXEC);
if (fd < 0) if (fd < 0)

4
src/udev/udev-builtin-hwdb.c
View File

@ -165,7 +165,7 @@ static int builtin_hwdb(sd_device *dev, int argc, char *argv[], bool test) {
if (r < 0) if (r < 0)
return log_device_debug_errno(dev, r, "Failed to lookup hwdb: %m"); return log_device_debug_errno(dev, r, "Failed to lookup hwdb: %m");
if (r == 0) if (r == 0)
return log_device_debug_errno(dev, ENOENT, "No entry found from hwdb: %m"); return log_device_debug_errno(dev, SYNTHETIC_ERRNO(ENODATA), "No entry found from hwdb.");
return r; return r;
} }
@ -180,7 +180,7 @@ static int builtin_hwdb(sd_device *dev, int argc, char *argv[], bool test) {
if (r < 0) if (r < 0)
return log_device_debug_errno(dev, r, "Failed to lookup hwdb: %m"); return log_device_debug_errno(dev, r, "Failed to lookup hwdb: %m");
if (r == 0) if (r == 0)
return log_device_debug_errno(dev, ENOENT, "No entry found from hwdb: %m"); return log_device_debug_errno(dev, SYNTHETIC_ERRNO(ENODATA), "No entry found from hwdb.");
return r; return r;
} }

4
src/udev/udev-builtin-keyboard.c
View File

@ -74,7 +74,7 @@ static int map_keycode(sd_device *dev, int fd, int scancode, const char *keycode
/* check if it's a numeric code already */ /* check if it's a numeric code already */
keycode_num = strtoul(keycode, &endptr, 0); keycode_num = strtoul(keycode, &endptr, 0);
if (endptr[0] !='\0') if (endptr[0] !='\0')
return log_device_error_errno(dev, EINVAL, "Failed to parse key identifier '%s'", keycode); return log_device_error_errno(dev, SYNTHETIC_ERRNO(EINVAL), "Failed to parse key identifier '%s'", keycode);
} }
map.scan = scancode; map.scan = scancode;
@ -152,7 +152,7 @@ static int set_trackpoint_sensitivity(sd_device *dev, const char *value) {
if (r < 0) if (r < 0)
return log_device_error_errno(dev, r, "Failed to parse POINTINGSTICK_SENSITIVITY '%s': %m", value); return log_device_error_errno(dev, r, "Failed to parse POINTINGSTICK_SENSITIVITY '%s': %m", value);
else if (val_i < 0 || val_i > 255) else if (val_i < 0 || val_i > 255)
return log_device_error_errno(dev, ERANGE, "POINTINGSTICK_SENSITIVITY %d outside range [0..255]", val_i); return log_device_error_errno(dev, SYNTHETIC_ERRNO(ERANGE), "POINTINGSTICK_SENSITIVITY %d outside range [0..255]", val_i);
xsprintf(val_s, "%d", val_i); xsprintf(val_s, "%d", val_i);

2
src/udev/udev-builtin-net_setup_link.c
View File

@ -16,7 +16,7 @@ static int builtin_net_setup_link(sd_device *dev, int argc, char **argv, bool te
int r; int r;
if (argc > 1) if (argc > 1)
return log_device_error_errno(dev, EINVAL, "This program takes no arguments."); return log_device_error_errno(dev, SYNTHETIC_ERRNO(EINVAL), "This program takes no arguments.");
r = link_get_driver(ctx, dev, &driver); r = link_get_driver(ctx, dev, &driver);
if (r >= 0) if (r >= 0)

2
src/udev/udev-node.c
View File

@ -300,7 +300,7 @@ static int node_permissions_apply(sd_device *dev, bool apply,
return log_device_debug_errno(dev, errno, "cannot stat() node '%s' (%m)", devnode); return log_device_debug_errno(dev, errno, "cannot stat() node '%s' (%m)", devnode);
if (((stats.st_mode & S_IFMT) != (mode & S_IFMT)) || (stats.st_rdev != devnum)) if (((stats.st_mode & S_IFMT) != (mode & S_IFMT)) || (stats.st_rdev != devnum))
return log_device_debug_errno(dev, EEXIST, "Found node '%s' with non-matching devnum %s, skip handling", return log_device_debug_errno(dev, SYNTHETIC_ERRNO(EEXIST), "Found node '%s' with non-matching devnum %s, skip handling",
devnode, id_filename); devnode, id_filename);
if (apply) { if (apply) {