terminal/screen: add color converter

[elogind.git] / src / shared / memfd.c

diff --git a/src/shared/memfd.c b/src/shared/memfd.c
index 6e2319d6eed5f9262598780af4cad81d64703c57..1feca0c9799c2da43e9937148d2460f2234573e4 100644 (file)
--- a/src/shared/memfd.c
+++ b/src/shared/memfd.c
@@ -29,26 +29,13 @@
 #include "bus-label.h"
 #include "missing.h"
 #include "memfd.h"
+#include "utf8.h"
 
 int memfd_new(const char *name) {
-
         _cleanup_free_ char *g = NULL;
         int fd;
 
-        assert(name);
-
-        if (name) {
-                /* The kernel side is pretty picky about the character
-                 * set here, let's do the usual bus escaping to deal
-                 * with that. */
-
-                g = bus_label_escape(name);
-                if (!g)
-                        return -ENOMEM;
-
-                name = g;
-
-        } else {
+        if (!name) {
                 char pr[17] = {};
 
                 /* If no name is specified we generate one. We include
@@ -62,7 +49,7 @@ int memfd_new(const char *name) {
                 else {
                         _cleanup_free_ char *e = NULL;
 
-                        e = bus_label_escape(pr);
+                        e = utf8_escape_invalid(pr);
                         if (!e)
                                 return -ENOMEM;
 
@@ -142,7 +129,7 @@ int memfd_get_size(int fd, uint64_t *sz) {
                 return -errno;
 
         *sz = stat.st_size;
-        return r;
+        return 0;
 }
 
 int memfd_set_size(int fd, uint64_t sz) {
@@ -154,14 +141,13 @@ int memfd_set_size(int fd, uint64_t sz) {
         if (r < 0)
                 return -errno;
 
-        return r;
+        return 0;
 }
 
 int memfd_new_and_map(const char *name, size_t sz, void **p) {
         _cleanup_close_ int fd = -1;
         int r;
 
-        assert(name);
         assert(sz > 0);
         assert(p);
 
@@ -221,7 +207,7 @@ int memfd_get_name(int fd, char **name) {
         if (!n)
                 return -ENOMEM;
 
-        e = bus_label_unescape(n);
+        e = utf8_escape_invalid(n);
         if (!e)
                 return -ENOMEM;