commit de0b699c61fc8211aa7f809f3a1b2d5214f44899
author Dmitry Shmidt <dimitrysh@google.com> Mon Feb 01 10:38:27 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 01 10:38:27 2010 -0800
tree a7e8e4ee8441cbca6486f7e5bb933361a3887ac2
parent f4fc3fbe982b67b82b143384bd5e7330d4202eca
parent d81a4e85c99f052f3e988799af5ff5e7b43d8cc2

Merge "Remove compilation warning"

config.c

diff --git a/config.c b/config.c
index e5aeac2..a1112b7 100644
--- a/config.c
+++ b/config.c
@@ -91,6 +91,14 @@
 	size_t res_len, *dst_len;
 	char **dst, *tmp;
 
+	if (os_strcmp(value, "NULL") == 0) {
+		wpa_printf(MSG_DEBUG, "Unset configuration string '%s'",
+			   data->name);
+		tmp = NULL;
+		res_len = 0;
+		goto set;
+	}
+
 	tmp = wpa_config_parse_string(value, &res_len);
 	if (tmp == NULL) {
 		wpa_printf(MSG_ERROR, "Line %d: failed to parse %s '%s'.",
@@ -123,6 +131,7 @@
 		return -1;
 	}
 
+set:
 	dst = (char **) (((u8 *) ssid) + (long) data->param1);
 	dst_len = (size_t *) (((u8 *) ssid) + (long) data->param2);
 	os_free(*dst);