From 290ea6a76e5774591765bcf1eba86e56da5cdf00 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 30 Jun 2014 00:50:40 +0300 Subject: [PATCH] Remove unnecessary tracking of first entry The pointer to the current position is enough to figure out whether the proto string is the first one in the buffer. Removing the separate tracking variable cleans up a static analyzer warning on dead assignment. Signed-off-by: Jouni Malinen --- wpa_supplicant/config.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index 86d6d7213..16031c923 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -435,7 +435,7 @@ static int wpa_config_parse_proto(const struct parse_data *data, static char * wpa_config_write_proto(const struct parse_data *data, struct wpa_ssid *ssid) { - int first = 1, ret; + int ret; char *buf, *pos, *end; pos = buf = os_zalloc(20); @@ -444,27 +444,27 @@ static char * wpa_config_write_proto(const struct parse_data *data, end = buf + 20; if (ssid->proto & WPA_PROTO_WPA) { - ret = os_snprintf(pos, end - pos, "%sWPA", first ? "" : " "); + ret = os_snprintf(pos, end - pos, "%sWPA", + pos == buf ? "" : " "); if (ret < 0 || ret >= end - pos) return buf; pos += ret; - first = 0; } if (ssid->proto & WPA_PROTO_RSN) { - ret = os_snprintf(pos, end - pos, "%sRSN", first ? "" : " "); + ret = os_snprintf(pos, end - pos, "%sRSN", + pos == buf ? "" : " "); if (ret < 0 || ret >= end - pos) return buf; pos += ret; - first = 0; } if (ssid->proto & WPA_PROTO_OSEN) { - ret = os_snprintf(pos, end - pos, "%sOSEN", first ? "" : " "); + ret = os_snprintf(pos, end - pos, "%sOSEN", + pos == buf ? "" : " "); if (ret < 0 || ret >= end - pos) return buf; pos += ret; - first = 0; } return buf;