tree-wide: use memstream-util

[thirdparty/systemd.git] / src / network / generator / network-generator.c

diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
index fee222f88e1826599c321bdfc5da4adb0995f8ad..823cd41f7ee0fdfd808497363ffe5bb239e0bec4 100644 (file)
--- a/src/network/generator/network-generator.c
+++ b/src/network/generator/network-generator.c
@@ -5,6 +5,7 @@
 #include "hostname-util.h"
 #include "log.h"
 #include "macro.h"
+#include "memstream-util.h"
 #include "netif-naming-scheme.h"
 #include "network-generator.h"
 #include "parse-util.h"
@@ -1004,10 +1005,9 @@ static int parse_cmdline_ifname_policy(Context *context, const char *key, const
 }
 
 int parse_cmdline_item(const char *key, const char *value, void *data) {
-        Context *context = data;
+        Context *context = ASSERT_PTR(data);
 
         assert(key);
-        assert(data);
 
         if (streq(key, "ip"))
                 return parse_cmdline_ip(context, key, value);
@@ -1199,94 +1199,49 @@ void link_dump(Link *link, FILE *f) {
 }
 
 int network_format(Network *network, char **ret) {
-        _cleanup_free_ char *s = NULL;
-        size_t sz = 0;
-        int r;
+        _cleanup_(memstream_done) MemStream m = {};
+        FILE *f;
 
         assert(network);
         assert(ret);
 
-        {
-                _cleanup_fclose_ FILE *f = NULL;
-
-                f = open_memstream_unlocked(&s, &sz);
-                if (!f)
-                        return -ENOMEM;
-
-                network_dump(network, f);
-
-                /* Add terminating 0, so that the output buffer is a valid string. */
-                fputc('\0', f);
+        f = memstream_init(&m);
+        if (!f)
+                return -ENOMEM;
 
-                r = fflush_and_check(f);
-        }
-        if (r < 0)
-                return r;
+        network_dump(network, f);
 
-        assert(s);
-        *ret = TAKE_PTR(s);
-        assert(sz > 0);
-        return (int) sz - 1;
+        return memstream_finalize(&m, ret, NULL);
 }
 
 int netdev_format(NetDev *netdev, char **ret) {
-        _cleanup_free_ char *s = NULL;
-        size_t sz = 0;
-        int r;
+        _cleanup_(memstream_done) MemStream m = {};
+        FILE *f;
 
         assert(netdev);
         assert(ret);
 
-        {
-                _cleanup_fclose_ FILE *f = NULL;
-
-                f = open_memstream_unlocked(&s, &sz);
-                if (!f)
-                        return -ENOMEM;
-
-                netdev_dump(netdev, f);
-
-                /* Add terminating 0, so that the output buffer is a valid string. */
-                fputc('\0', f);
+        f = memstream_init(&m);
+        if (!f)
+                return -ENOMEM;
 
-                r = fflush_and_check(f);
-        }
-        if (r < 0)
-                return r;
+        netdev_dump(netdev, f);
 
-        assert(s);
-        *ret = TAKE_PTR(s);
-        assert(sz > 0);
-        return (int) sz - 1;
+        return memstream_finalize(&m, ret, NULL);
 }
 
 int link_format(Link *link, char **ret) {
-        _cleanup_free_ char *s = NULL;
-        size_t sz = 0;
-        int r;
+        _cleanup_(memstream_done) MemStream m = {};
+        FILE *f;
 
         assert(link);
         assert(ret);
 
-        {
-                _cleanup_fclose_ FILE *f = NULL;
-
-                f = open_memstream_unlocked(&s, &sz);
-                if (!f)
-                        return -ENOMEM;
-
-                link_dump(link, f);
-
-                /* Add terminating 0, so that the output buffer is a valid string. */
-                fputc('\0', f);
+        f = memstream_init(&m);
+        if (!f)
+                return -ENOMEM;
 
-                r = fflush_and_check(f);
-        }
-        if (r < 0)
-                return r;
+        link_dump(link, f);
 
-        assert(s);
-        *ret = TAKE_PTR(s);
-        assert(sz > 0);
-        return (int) sz - 1;
+        return memstream_finalize(&m, ret, NULL);
 }