X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_wireless_info.c;h=dcfde528a0a846cc04a63235775f4724a5e0b2ed;hb=4ea804b751f9394b7b10b520212169a491c698a6;hp=d229538d7586f7a86b810a05df3032b23b3bfbe5;hpb=53fb9b4f18cd9ee3a64be5084ccc76aeea279515;p=i3%2Fi3status diff --git a/src/print_wireless_info.c b/src/print_wireless_info.c index d229538..dcfde52 100644 --- a/src/print_wireless_info.c +++ b/src/print_wireless_info.c @@ -16,6 +16,7 @@ #endif #ifdef __APPLE__ +#include #define IW_ESSID_MAX_SIZE 32 #endif @@ -479,7 +480,7 @@ error1: * | 127.0.0.1 | no IP | IPv4 | ok | * | 127.0.0.1 | ::1/128 | IPv4 | ok | */ -void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down) { +void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down, const char *format_quality) { const char *walk; char *outwalk = buffer; wireless_info_t info; @@ -489,7 +490,10 @@ void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, char *ipv4_address = sstrdup(get_ip_addr(interface, AF_INET)); char *ipv6_address = sstrdup(get_ip_addr(interface, AF_INET6)); - // Removing '%' and following characters from IPv6 + /* + * Removing '%' and following characters from IPv6 since the interface identifier is redundant, + * as the output already includes the interface name. + */ if (ipv6_address != NULL) { char *prct_ptr = strstr(ipv6_address, "%"); if (prct_ptr != NULL) { @@ -536,7 +540,7 @@ void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, if (BEGINS_WITH(walk + 1, "quality")) { if (info.flags & WIRELESS_INFO_FLAG_HAS_QUALITY) { if (info.quality_max) - outwalk += sprintf(outwalk, "%3d%s", PERCENT_VALUE(info.quality, info.quality_max), pct_mark); + outwalk += sprintf(outwalk, format_quality, PERCENT_VALUE(info.quality, info.quality_max), pct_mark); else outwalk += sprintf(outwalk, "%d", info.quality); } else {