add yajl compat code

[i3/i3status] / src / print_ipv6_addr.c

diff --git a/src/print_ipv6_addr.c b/src/print_ipv6_addr.c
index e96c0d3d712b8b04eb2668ab6084ede42fe3b3d9..be64ba3ae6acfe8dba02a7d02a22397409327894 100644 (file)
--- a/src/print_ipv6_addr.c
+++ b/src/print_ipv6_addr.c
@@ -8,6 +8,10 @@
 #include <netdb.h>
 #include <string.h>
 #include <arpa/inet.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
+
+#include "i3status.h"
 
 static char *get_sockname(struct addrinfo *addr) {
         static char buf[INET6_ADDRSTRLEN+1];
@@ -107,24 +111,27 @@ static char *get_ipv6_addr() {
         return NULL;
 }
 
-void print_ipv6_info(const char *format_up, const char *format_down) {
+void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, const char *format_down) {
         const char *walk;
         char *addr_string = get_ipv6_addr();
+        char *outwalk = buffer;
 
         if (addr_string == NULL) {
-                printf("%s", format_down);
+                OUTPUT_FULL_TEXT(format_down);
                 return;
         }
 
         for (walk = format_up; *walk != '\0'; walk++) {
                 if (*walk != '%') {
-                        putchar(*walk);
+                        *(outwalk++) = *walk;
                         continue;
                 }
 
                 if (strncmp(walk+1, "ip", strlen("ip")) == 0) {
-                        printf("%s", addr_string);
+                        outwalk += sprintf(outwalk, "%s", addr_string);
                         walk += strlen("ip");
                 }
         }
+
+        OUTPUT_FULL_TEXT(buffer);
 }