chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: when creating an activating busname attach all metadata fields to the messages...
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
sd-memfd.c
diff --git
a/src/libsystemd/sd-bus/sd-memfd.c
b/src/libsystemd/sd-bus/sd-memfd.c
index 7c71476eeef5043d0b096a6ca35c4b4cc6c99656..fcf3e73124ab27319eb1e5e305e8500317a97d36 100644
(file)
--- a/
src/libsystemd/sd-bus/sd-memfd.c
+++ b/
src/libsystemd/sd-bus/sd-memfd.c
@@
-27,6
+27,7
@@
#include "util.h"
#include "kdbus.h"
#include "util.h"
#include "kdbus.h"
+#include "bus-label.h"
#include "sd-memfd.h"
#include "sd-bus.h"
#include "sd-memfd.h"
#include "sd-bus.h"
@@
-56,7
+57,7
@@
_public_ int sd_memfd_new(sd_memfd **m, const char *name) {
* set here, let's do the usual bus escaping to deal
* with that. */
* set here, let's do the usual bus escaping to deal
* with that. */
- g =
sd_
bus_label_escape(name);
+ g = bus_label_escape(name);
if (!g)
return -ENOMEM;
if (!g)
return -ENOMEM;
@@
-76,7
+77,7
@@
_public_ int sd_memfd_new(sd_memfd **m, const char *name) {
else {
_cleanup_free_ char *e = NULL;
else {
_cleanup_free_ char *e = NULL;
- e =
sd_
bus_label_escape(pr);
+ e = bus_label_escape(pr);
if (!e)
return -ENOMEM;
if (!e)
return -ENOMEM;
@@
-106,7
+107,7
@@
_public_ int sd_memfd_new(sd_memfd **m, const char *name) {
n = new0(struct sd_memfd, 1);
if (!n) {
n = new0(struct sd_memfd, 1);
if (!n) {
-
close_nointr_nofail
(cmd->fd);
+
safe_close
(cmd->fd);
return -ENOMEM;
}
return -ENOMEM;
}
@@
-143,7
+144,7
@@
_public_ void sd_memfd_free(sd_memfd *m) {
if (m->f)
fclose(m->f);
else
if (m->f)
fclose(m->f);
else
-
close_nointr_nofail
(m->fd);
+
safe_close
(m->fd);
free(m);
}
free(m);
}
@@
-311,7
+312,7
@@
_public_ int sd_memfd_get_name(sd_memfd *m, char **name) {
if (!n)
return -ENOMEM;
if (!n)
return -ENOMEM;
- e =
sd_
bus_label_unescape(n);
+ e = bus_label_unescape(n);
if (!e)
return -ENOMEM;
if (!e)
return -ENOMEM;