From ba90eab419576a0b01783dcda001c7e34a9bc985 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 3 Jun 2013 11:22:39 +1000 Subject: [PATCH] Rename pid/vid to product-id and vendor-id Slightly more expressive and it's not that painful to type. Signed-off-by: Peter Hutterer --- libevdev/libevdev.c | 4 ++-- libevdev/libevdev.h | 4 ++-- test/libevdev-print.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c index b2ae094..9604669 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -584,12 +584,12 @@ libevdev_get_name(const struct libevdev *dev) return dev->name; } -int libevdev_get_pid(const struct libevdev *dev) +int libevdev_get_product_id(const struct libevdev *dev) { return dev->ids.product; } -int libevdev_get_vid(const struct libevdev *dev) +int libevdev_get_vendor_id(const struct libevdev *dev) { return dev->ids.vendor; } diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h index d18bd1f..5f58bc0 100644 --- a/libevdev/libevdev.h +++ b/libevdev/libevdev.h @@ -186,13 +186,13 @@ const char* libevdev_get_name(const struct libevdev *dev); * * @note This function is signal-safe. */ -int libevdev_get_pid(const struct libevdev *dev); +int libevdev_get_product_id(const struct libevdev *dev); /** * @return The device's vendor ID * * @note This function is signal-safe. */ -int libevdev_get_vid(const struct libevdev *dev); +int libevdev_get_vendor_id(const struct libevdev *dev); /** * @return The device's bus type diff --git a/test/libevdev-print.c b/test/libevdev-print.c index 8f0793a..89f4b10 100644 --- a/test/libevdev-print.c +++ b/test/libevdev-print.c @@ -133,8 +133,8 @@ main(int argc, char **argv) printf("Input device ID: bus %#x vendor %#x product %#x\n", libevdev_get_bustype(dev), - libevdev_get_vid(dev), - libevdev_get_pid(dev)); + libevdev_get_vendor_id(dev), + libevdev_get_product_id(dev)); printf("Input device name: \"%s\"\n", libevdev_get_name(dev)); print_bits(dev); print_props(dev);