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;