jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove unnecessary tracking of first entry

Browse source 
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 <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-06-30 00:50:40 +03:00
parent d3fa2bbb02
commit 290ea6a76e
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wpa_supplicant/config.c
View file

@ -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;