]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
resolved: simplify dns_packet_append_string()
authorLennart Poettering <lennart@poettering.net>
Wed, 2 Dec 2015 19:35:02 +0000 (20:35 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 2 Dec 2015 19:35:08 +0000 (20:35 +0100)
It essentially does the same as dns_packet_append_raw_string(), hence
make it a wrapper around it.

src/resolve/resolved-dns-packet.c

index 75ca23fd087c2e417e4aab50040c678192debb23..4f6498b28b6bd7f52e05e23899203af225be7d5c 100644 (file)
@@ -351,25 +351,10 @@ int dns_packet_append_uint32(DnsPacket *p, uint32_t v, size_t *start) {
 }
 
 int dns_packet_append_string(DnsPacket *p, const char *s, size_t *start) {
-        void *d;
-        size_t l;
-        int r;
-
         assert(p);
         assert(s);
 
-        l = strlen(s);
-        if (l > 255)
-                return -E2BIG;
-
-        r = dns_packet_extend(p, 1 + l, &d, start);
-        if (r < 0)
-                return r;
-
-        ((uint8_t*) d)[0] = (uint8_t) l;
-        memcpy(((uint8_t*) d) + 1, s, l);
-
-        return 0;
+        return dns_packet_append_raw_string(p, s, strlen(s), start);
 }
 
 int dns_packet_append_raw_string(DnsPacket *p, const void *s, size_t size, size_t *start) {