Rename ID getters to have a consistent naming scheme

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>

diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
index d287fd8..93d5d2f 100644 (file)
--- a/libevdev/libevdev.c
+++ b/libevdev/libevdev.c
@@ -684,10 +684,15 @@ int libevdev_get_##name(const struct libevdev *dev) \
        return dev->ids.field; \
 }
 
-PRODUCT_GETTER(product_id, product);
-PRODUCT_GETTER(vendor_id, vendor);
-PRODUCT_GETTER(bustype, bustype);
-PRODUCT_GETTER(version, version);
+PRODUCT_GETTER(product_id, product); /* DEPRECATED */
+PRODUCT_GETTER(vendor_id, vendor); /* DEPRECATED */
+PRODUCT_GETTER(bustype, bustype); /* DEPRECATED */
+PRODUCT_GETTER(version, version); /* DEPRECATED */
+
+PRODUCT_GETTER(id_product, product);
+PRODUCT_GETTER(id_vendor, vendor);
+PRODUCT_GETTER(id_bustype, bustype);
+PRODUCT_GETTER(id_version, version);
 
 int libevdev_get_driver_version(const struct libevdev *dev)
 {

diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h
index b85f75b..bb85458 100644 (file)
--- a/libevdev/libevdev.h
+++ b/libevdev/libevdev.h
@@ -584,7 +584,7 @@ void libevdev_set_uniq(struct libevdev *dev, const char *uniq);
  *
  * @note This function is signal-safe.
  */
-int libevdev_get_product_id(const struct libevdev *dev);
+int libevdev_get_id_product(const struct libevdev *dev);
 
 /**
  * @ingroup bits
@@ -595,7 +595,7 @@ int libevdev_get_product_id(const struct libevdev *dev);
  *
  * @note This function is signal-safe.
  */
-int libevdev_get_vendor_id(const struct libevdev *dev);
+int libevdev_get_id_vendor(const struct libevdev *dev);
 
 /**
  * @ingroup bits
@@ -606,7 +606,7 @@ int libevdev_get_vendor_id(const struct libevdev *dev);
  *
  * @note This function is signal-safe.
  */
-int libevdev_get_bustype(const struct libevdev *dev);
+int libevdev_get_id_bustype(const struct libevdev *dev);
 
 /**
  * @ingroup bits
@@ -617,7 +617,7 @@ int libevdev_get_bustype(const struct libevdev *dev);
  *
  * @note This function is signal-safe.
  */
-int libevdev_get_version(const struct libevdev *dev);
+int libevdev_get_id_version(const struct libevdev *dev);
 
 /**
  * @ingroup bits
@@ -1177,5 +1177,10 @@ int libevdev_get_abs_max(const struct libevdev *dev, unsigned int code) LIBEVDEV
 /* replacement: libevdev_get_property_name */
 const char* libevdev_get_input_prop_name(unsigned int prop) LIBEVDEV_DEPRECATED;
 
+int libevdev_get_product_id(const struct libevdev *dev) LIBEVDEV_DEPRECATED;
+int libevdev_get_vendor_id(const struct libevdev *dev) LIBEVDEV_DEPRECATED;
+int libevdev_get_bustype(const struct libevdev *dev) LIBEVDEV_DEPRECATED;
+int libevdev_get_version(const struct libevdev *dev) LIBEVDEV_DEPRECATED;
+
 /**************************************/
 #endif /* libevdev_H */

diff --git a/test/test-libevdev-has-event.c b/test/test-libevdev-has-event.c
index 7e607e5..577a85f 100644 (file)
--- a/test/test-libevdev-has-event.c
+++ b/test/test-libevdev-has-event.c
@@ -430,10 +430,10 @@ START_TEST(test_device_name)
        str = libevdev_get_uniq(dev);
        ck_assert(str == NULL);
 
-       ck_assert_int_eq(libevdev_get_bustype(dev), ids.bustype);
-       ck_assert_int_eq(libevdev_get_vendor_id(dev), ids.vendor);
-       ck_assert_int_eq(libevdev_get_product_id(dev), ids.product);
-       ck_assert_int_eq(libevdev_get_version(dev), ids.version);
+       ck_assert_int_eq(libevdev_get_id_bustype(dev), ids.bustype);
+       ck_assert_int_eq(libevdev_get_id_vendor(dev), ids.vendor);
+       ck_assert_int_eq(libevdev_get_id_product(dev), ids.product);
+       ck_assert_int_eq(libevdev_get_id_version(dev), ids.version);
        ck_assert_int_eq(libevdev_get_driver_version(dev), EV_VERSION);
 
        uinput_device_free(uidev);

diff --git a/tools/libevdev-events.c b/tools/libevdev-events.c
index 9b2e1a7..1590965 100644 (file)
--- a/tools/libevdev-events.c
+++ b/tools/libevdev-events.c
@@ -158,9 +158,9 @@ main(int argc, char **argv)
        }
 
        printf("Input device ID: bus %#x vendor %#x product %#x\n",
-                       libevdev_get_bustype(dev),
-                       libevdev_get_vendor_id(dev),
-                       libevdev_get_product_id(dev));
+                       libevdev_get_id_bustype(dev),
+                       libevdev_get_id_vendor(dev),
+                       libevdev_get_id_product(dev));
        printf("Evdev version: %x\n", libevdev_get_driver_version(dev));
        printf("Input device name: \"%s\"\n", libevdev_get_name(dev));
        printf("Phys location: %s\n", libevdev_get_phys(dev));