From 3c0cb716fa597f1613987262a2733817534d2140 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Wed, 22 Dec 2010 08:02:35 +0100 Subject: Use a single abi version variable Simplify versioning by using a single coded variable. Signed-off-by: Henrik Rydberg --- src/evemu-impl.h | 2 +- src/evemu.c | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/evemu-impl.h b/src/evemu-impl.h index 1112e92..0d3489e 100644 --- a/src/evemu-impl.h +++ b/src/evemu-impl.h @@ -8,7 +8,7 @@ #define EVPLAY_NBYTES ((EVPLAY_NBITS + 7) / 8) struct evemu_device { - int version_major, version_minor; + unsigned int version; char name[UINPUT_MAX_NAME_SIZE]; struct input_id id; unsigned char prop[EVPLAY_NBYTES]; diff --git a/src/evemu.c b/src/evemu.c index 80257c6..553e765 100644 --- a/src/evemu.c +++ b/src/evemu.c @@ -70,9 +70,7 @@ struct evemu_device *evemu_new(const char *name) { struct evemu_device *dev = calloc(1, sizeof(struct evemu_device)); - dev->version_major = EVEMU_VERSION_MAJOR; - dev->version_minor = EVEMU_VERSION_MINOR; - + dev->version = EVEMU_VERSION; if (name && strlen(name) < sizeof(dev->name)) strcpy(dev->name, name); @@ -90,14 +88,9 @@ void evemu_delete(struct evemu_device *dev) free(dev); } -int evemu_get_version_major(const struct evemu_device *dev) -{ - return dev->version_major; -} - -int evemu_get_version_minor(const struct evemu_device *dev) +unsigned int evemu_get_version(const struct evemu_device *dev) { - return dev->version_minor; + return dev->version; } const char *evemu_get_name(const struct evemu_device *dev) -- cgit v1.2.3