aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2009-02-03 11:25:49 (GMT)
committerJouni Malinen <j@w1.fi>2009-02-08 10:29:03 (GMT)
commit1e1a09ce1c400ff54ccb9ecc30decc424118f58a (patch)
tree6400bad0855b1967cd47527fc16e1044105e9cf0 /src
parent24ecc10df8215187702e1583092fc1d585fa943a (diff)
downloadhostap-06-1e1a09ce1c400ff54ccb9ecc30decc424118f58a.zip
hostap-06-1e1a09ce1c400ff54ccb9ecc30decc424118f58a.tar.gz
hostap-06-1e1a09ce1c400ff54ccb9ecc30decc424118f58a.tar.bz2
UPnP: Minor coding style cleanup
(cherry picked from commit e80e5163f8b53f20f816f0d06d618f54ce3d79aa)
Diffstat (limited to 'src')
-rw-r--r--src/wps/wps_upnp.c6
-rw-r--r--src/wps/wps_upnp_event.c6
-rw-r--r--src/wps/wps_upnp_ssdp.c7
-rw-r--r--src/wps/wps_upnp_web.c2
4 files changed, 10 insertions, 11 deletions
diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
index bebecc2..5fdd27d 100644
--- a/src/wps/wps_upnp.c
+++ b/src/wps/wps_upnp.c
@@ -567,9 +567,8 @@ void subscription_unlink(struct subscription *s)
/* only one? */
sm->subscriptions = NULL;
} else {
- if (sm->subscriptions == s) {
+ if (sm->subscriptions == s)
sm->subscriptions = s->next;
- }
s->next->prev = s->prev;
s->prev->next = s->next;
}
@@ -856,7 +855,8 @@ static int get_netif_info(const char *net_if, unsigned *ip_addr,
if (*ip_addr_text == NULL || *mac_addr_text == NULL)
goto fail;
- if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+ sock = socket(AF_INET, SOCK_DGRAM, 0);
+ if (sock < 0)
goto fail;
os_strncpy(req.ifr_name, net_if, sizeof(req.ifr_name));
diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
index 7e7ce88..12e16f4 100644
--- a/src/wps/wps_upnp_event.c
+++ b/src/wps/wps_upnp_event.c
@@ -400,8 +400,7 @@ static int event_send_start(struct subscription *s)
*/
if (connect(e->sd, (struct sockaddr *) &e->addr->saddr,
sizeof(e->addr->saddr))) {
- if (errno == EINPROGRESS) {
- } else {
+ if (errno != EINPROGRESS) {
event_retry(e, 1);
return -1;
}
@@ -432,7 +431,8 @@ void event_send_all_later_handler(void *eloop_data, void *user_ctx)
int nerrors = 0;
sm->event_send_all_queued = 0;
- if ((s = sm->subscriptions) == NULL)
+ s = sm->subscriptions;
+ if (s == NULL)
return;
do {
if (s->addr_list == NULL) {
diff --git a/src/wps/wps_upnp_ssdp.c b/src/wps/wps_upnp_ssdp.c
index 71dcc96..6a94c59 100644
--- a/src/wps/wps_upnp_ssdp.c
+++ b/src/wps/wps_upnp_ssdp.c
@@ -51,7 +51,7 @@ static int token_eq(const char *s1, const char *s2)
if (end1 || end2 || c1 != c2)
break;
}
- return (end1 && end2); /* reached end of both words? */
+ return end1 && end2; /* reached end of both words? */
}
@@ -359,10 +359,9 @@ void msearchreply_state_machine_stop(struct advertisement_state_machine *a)
wpa_printf(MSG_DEBUG, "WPS UPnP: M-SEARCH stop");
if (a->next == a) {
sm->msearch_replies = NULL;
- } else {
- if (sm->msearch_replies == a) {
+ } else {
+ if (sm->msearch_replies == a)
sm->msearch_replies = a->next;
- }
a->next->prev = a->prev;
a->prev->next = a->next;
}
diff --git a/src/wps/wps_upnp_web.c b/src/wps/wps_upnp_web.c
index 2e0f296..c2043a5 100644
--- a/src/wps/wps_upnp_web.c
+++ b/src/wps/wps_upnp_web.c
@@ -253,7 +253,7 @@ upnp_get_first_document_item(char *doc, const char *item, char **value)
if (!os_strncasecmp(tagname, match, match_len) &&
*tag != '/' &&
(tagname[match_len] == '>' ||
- !isgraph(tagname[match_len]) )) {
+ !isgraph(tagname[match_len]))) {
break;
}
}