marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use format_placeholder for ipv6_addr

Browse Source
This commit is contained in:
Felix Buehler 2020-03-31 14:52:34 +02:00
parent 101215bbc8
commit ebaeb8fb23
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/print_ipv6_addr.c
View File

@ -118,7 +118,6 @@ static char *get_ipv6_addr(void) {
}
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;
@ -131,18 +130,13 @@ void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, con
}
START_COLOR("color_good");
for (walk = format_up; *walk != '\0'; walk++) {
if (*walk != '%') {
*(outwalk++) = *walk;
} else if (BEGINS_WITH(walk + 1, "ip")) {
outwalk += sprintf(outwalk, "%s", addr_string);
walk += strlen("ip");
placeholder_t placeholders[] = {
{.name = "%ip", .value = addr_string}};
} else {
*(outwalk++) = '%';
}
}
const size_t num = sizeof(placeholders) / sizeof(placeholder_t);
buffer = format_placeholders(format_up, &placeholders[0], num);
END_COLOR;
OUTPUT_FULL_TEXT(buffer);
free(buffer);
}