catalog: open up catalog internals

[elogind.git] / src / stdio-bridge / stdio-bridge.c

diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
index f926fe55381275872dfb582645570f6ad1aadf87..ea82c8f7c9fc673d6440b99f3c4d0d71fe7ac88b 100644 (file)
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/src/stdio-bridge/stdio-bridge.c
@@ -46,7 +46,7 @@ static void format_uid(char *buf, size_t l) {
         assert(l > 0);
 
         snprintf(text, sizeof(text)-1, "%llu", (unsigned long long) geteuid());
-        text[sizeof(text)-1] = 0;
+        char_array_0(text);
 
         memset(buf, 0, l);
 
@@ -69,16 +69,16 @@ static size_t patch_in_line(char *line, size_t l, size_t left) {
         } else
                 r = 0;
 
-        if (l == 5 && strncmp(line, "BEGIN", 5) == 0) {
+        if (l == 5 && strneq(line, "BEGIN", 5)) {
                 r += l;
                 auth_over = true;
 
-        } else if (l == 17 && strncmp(line, "NEGOTIATE_UNIX_FD", 17) == 0) {
+        } else if (l == 17 && strneq(line, "NEGOTIATE_UNIX_FD", 17)) {
                 memmove(line + 13, line + 17, left);
                 memcpy(line, "NEGOTIATE_NOP", 13);
                 r += 13;
 
-        } else if (l >= 14 && strncmp(line, "AUTH EXTERNAL ", 14) == 0) {
+        } else if (l >= 14 && strneq(line, "AUTH EXTERNAL ", 14)) {
                 char uid[20*2 + 1];
                 size_t len;