diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2011-03-15 14:04:13 +0100 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2011-03-15 14:04:13 +0100 |
| commit | bb19e820a29b326891fb9a4fe58e64b1935c8e72 (patch) | |
| tree | eaf17ac7be4f90d30cf034fbdc9a59a6fd3394c2 /src | |
| parent | 9994438da1c74a27be7677d8a22b8158309e9c37 (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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/evemu.c | 13 |
1 files changed, 10 insertions, 3 deletions
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) | |||
| 86 | { | 86 | { |
| 87 | struct evemu_device *dev = calloc(1, sizeof(struct evemu_device)); | 87 | struct evemu_device *dev = calloc(1, sizeof(struct evemu_device)); |
| 88 | 88 | ||
| 89 | dev->version = EVEMU_VERSION; | 89 | if (dev) { |
| 90 | if (name && strlen(name) < sizeof(dev->name)) | 90 | dev->version = EVEMU_VERSION; |
| 91 | strcpy(dev->name, name); | 91 | evemu_set_name(dev, name); |
| 92 | } | ||
| 92 | 93 | ||
| 93 | return dev; | 94 | return dev; |
| 94 | } | 95 | } |
| @@ -114,6 +115,12 @@ const char *evemu_get_name(const struct evemu_device *dev) | |||
| 114 | return dev->name; | 115 | return dev->name; |
| 115 | } | 116 | } |
| 116 | 117 | ||
| 118 | void evemu_set_name(struct evemu_device *dev, const char *name) | ||
| 119 | { | ||
| 120 | if (name && strlen(name) < sizeof(dev->name)) | ||
| 121 | strcpy(dev->name, name); | ||
| 122 | } | ||
| 123 | |||
| 117 | unsigned int evemu_get_id_bustype(const struct evemu_device *dev) | 124 | unsigned int evemu_get_id_bustype(const struct evemu_device *dev) |
| 118 | { | 125 | { |
| 119 | return dev->id.bustype; | 126 | return dev->id.bustype; |
