fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2026-05-09 10:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use ENOMEM instead of ENOSPC

Browse source 
From errno(3):
   ENOMEM          Not enough space (POSIX.1)
   ENOSPC          No space left on device (POSIX.1)

when we run out memory the reason is a failed malloc, for which ENOMEM
seems more appropriate.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Peter Hutterer 2013-08-31 12:23:44 +10:00
parent 69f89c8877
commit 9675287062
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libevdev/libevdev-int.h
View file

@ -194,11 +194,11 @@ static inline int
queue_alloc(struct libevdev *dev, size_t size) queue_alloc(struct libevdev *dev, size_t size)
{ {
if (size == 0) if (size == 0)
return -ENOSPC; return -ENOMEM;
dev->queue = calloc(size, sizeof(struct input_event)); dev->queue = calloc(size, sizeof(struct input_event));
if (!dev->queue) if (!dev->queue)
return -ENOSPC; return -ENOMEM;
dev->queue_size = size; dev->queue_size = size;
dev->queue_next = 0; dev->queue_next = 0;

8
libevdev/libevdev.c
View file

@ -89,7 +89,7 @@ libevdev_new_from_fd(int fd, struct libevdev **dev)
d = libevdev_new(); d = libevdev_new();
if (!d) if (!d)
return -ENOSPC; return -ENOMEM;
rc = libevdev_set_fd(d, fd); rc = libevdev_set_fd(d, fd);
if (rc < 0) if (rc < 0)
@ -152,7 +152,7 @@ libevdev_set_fd(struct libevdev* dev, int fd)
free(dev->name); free(dev->name);
dev->name = strdup(buf); dev->name = strdup(buf);
if (!dev->name) { if (!dev->name) {
errno = ENOSPC; errno = ENOMEM;
goto out; goto out;
} }
@ -167,7 +167,7 @@ libevdev_set_fd(struct libevdev* dev, int fd)
} else { } else {
dev->phys = strdup(buf); dev->phys = strdup(buf);
if (!dev->phys) { if (!dev->phys) {
errno = ENOSPC; errno = ENOMEM;
goto out; goto out;
} }
} }
@ -182,7 +182,7 @@ libevdev_set_fd(struct libevdev* dev, int fd)
} else { } else {
dev->uniq = strdup(buf); dev->uniq = strdup(buf);
if (!dev->uniq) { if (!dev->uniq) {
errno = ENOSPC; errno = ENOMEM;
goto out; goto out;
} }
} }

2
libevdev/libevdev.h
View file

@ -202,7 +202,7 @@ extern "C" {
* *
* dev = libevdev_new(); * dev = libevdev_new();
* if (!dev) * if (!dev)
* return ENOSPC; * return ENOMEM;
* *
* err = libevdev_set_fd(dev, fd); * err = libevdev_set_fd(dev, fd);
* if (err < 0) { * if (err < 0) {

2
test/test-common-uinput.c
View file

@ -75,7 +75,7 @@ uinput_device_new_with_events_v(struct uinput_device **d, const char *name, cons
dev = uinput_device_new(name); dev = uinput_device_new(name);
if (!dev) if (!dev)
return -ENOSPC; return -ENOMEM;
if (id != DEFAULT_IDS) if (id != DEFAULT_IDS)
uinput_device_set_ids(dev, id); uinput_device_set_ids(dev, id);

4
test/test-int-queue.c
View file

@ -34,10 +34,10 @@ START_TEST(test_queue_alloc)
int rc; int rc;
rc = queue_alloc(&dev, 0); rc = queue_alloc(&dev, 0);
ck_assert_int_eq(rc, -ENOSPC); ck_assert_int_eq(rc, -ENOMEM);
rc = queue_alloc(&dev, ULONG_MAX); rc = queue_alloc(&dev, ULONG_MAX);
ck_assert_int_eq(rc, -ENOSPC); ck_assert_int_eq(rc, -ENOMEM);
rc = queue_alloc(&dev, 100); rc = queue_alloc(&dev, 100);
ck_assert_int_eq(rc, 0); ck_assert_int_eq(rc, 0);