chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9021bb9
)
sd-event: simplify sd_event_source_set_name()
author
David Herrmann
<dh.herrmann@gmail.com>
Thu, 28 Aug 2014 20:44:28 +0000
(22:44 +0200)
committer
David Herrmann
<dh.herrmann@gmail.com>
Thu, 28 Aug 2014 20:44:28 +0000
(22:44 +0200)
free_and_strdup() does exactly the same as sd_event_source_set_name(), use
it!
src/libsystemd/sd-event/sd-event.c
patch
|
blob
|
history
diff --git
a/src/libsystemd/sd-event/sd-event.c
b/src/libsystemd/sd-event/sd-event.c
index c92e065c76e9748f6b523e24c01da1c239d11e02..985ff2829bdbab1baa8b74fbb479b779d5f93992 100644
(file)
--- a/
src/libsystemd/sd-event/sd-event.c
+++ b/
src/libsystemd/sd-event/sd-event.c
@@
-1227,20
+1227,9
@@
_public_ sd_event_source* sd_event_source_unref(sd_event_source *s) {
}
_public_ int sd_event_source_set_name(sd_event_source *s, const char *name) {
- char *new_name = NULL;
-
assert_return(s, -EINVAL);
- if (name) {
- new_name = strdup(name);
- if (!new_name)
- return -ENOMEM;
- }
-
- free(s->name);
- s->name = new_name;
-
- return 0;
+ return free_and_strdup(&s->name, name);
}
_public_ int sd_event_source_get_name(sd_event_source *s, const char **name) {