summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2011-03-15 14:04:13 +0100
committerHenrik Rydberg <rydberg@euromail.se>2011-03-15 14:04:13 +0100
commitbb19e820a29b326891fb9a4fe58e64b1935c8e72 (patch)
treeeaf17ac7be4f90d30cf034fbdc9a59a6fd3394c2
parent9994438da1c74a27be7677d8a22b8158309e9c37 (diff)
Add the missing evemu_set_name() function
During the evolution of evemu, the process of setting the device name has shifted towards the evemu_extract() and evemu_read() functions, rendering the initial name in evemu_new() more or less useless. This patch adds the missing evemu_set_name() function, in order to make it possible to override the device name before device creation. Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
-rw-r--r--include/evemu.h1
-rw-r--r--src/evemu.c13
2 files changed, 11 insertions, 3 deletions
diff --git a/include/evemu.h b/include/evemu.h
index 31107bc..6e6ed44 100644
--- a/include/evemu.h
+++ b/include/evemu.h
@@ -55,6 +55,7 @@ void evemu_delete(struct evemu_device *dev);
unsigned int evemu_get_version(const struct evemu_device *dev);
const char *evemu_get_name(const struct evemu_device *dev);
+void evemu_set_name(struct evemu_device *dev, const char *name);
unsigned int evemu_get_id_bustype(const struct evemu_device *dev);
unsigned int evemu_get_id_vendor(const struct evemu_device *dev);
diff --git a/src/evemu.c b/src/evemu.c
index f06c64a..988ae7c 100644
--- a/src/evemu.c
+++ b/src/evemu.c
@@ -86,9 +86,10 @@ struct evemu_device *evemu_new(const char *name)
{
struct evemu_device *dev = calloc(1, sizeof(struct evemu_device));
- dev->version = EVEMU_VERSION;
- if (name && strlen(name) < sizeof(dev->name))
- strcpy(dev->name, name);
+ if (dev) {
+ dev->version = EVEMU_VERSION;
+ evemu_set_name(dev, name);
+ }
return dev;
}
@@ -114,6 +115,12 @@ const char *evemu_get_name(const struct evemu_device *dev)
return dev->name;
}
+void evemu_set_name(struct evemu_device *dev, const char *name)
+{
+ if (name && strlen(name) < sizeof(dev->name))
+ strcpy(dev->name, name);
+}
+
unsigned int evemu_get_id_bustype(const struct evemu_device *dev)
{
return dev->id.bustype;