---
tools/dhcp-server-test.c | 8 ++++----
tools/dhcp-test.c | 8 ++++----
tools/resolv-test.c | 4 ++--
tools/supplicant.c | 4 ++--
tools/web-test.c | 4 ++--
tools/wispr.c | 4 ++--
tools/wpad-test.c | 4 ++--
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/tools/dhcp-server-test.c b/tools/dhcp-server-test.c
index 4252e62..817ced2 100644
--- a/tools/dhcp-server-test.c
+++ b/tools/dhcp-server-test.c
@@ -77,18 +77,18 @@ int main(int argc, char *argv[])
struct sigaction sa;
GDHCPServerError error;
GDHCPServer *dhcp_server;
- int index;
+ int ifindex;
if (argc < 2) {
printf("Usage: dhcp-server-test <interface index>\n");
exit(0);
}
- index = atoi(argv[1]);
+ ifindex = atoi(argv[1]);
- printf("Create DHCP server for interface %d\n", index);
+ printf("Create DHCP server for interface %d\n", ifindex);
- dhcp_server = g_dhcp_server_new(G_DHCP_IPV4, index, &error);
+ dhcp_server = g_dhcp_server_new(G_DHCP_IPV4, ifindex, &error);
if (dhcp_server == NULL) {
handle_error(error);
exit(0);
diff --git a/tools/dhcp-test.c b/tools/dhcp-test.c
index 284656b..6e99f93 100644
--- a/tools/dhcp-test.c
+++ b/tools/dhcp-test.c
@@ -131,18 +131,18 @@ int main(int argc, char *argv[])
struct sigaction sa;
GDHCPClientError error;
GDHCPClient *dhcp_client;
- int index;
+ int ifindex;
if (argc < 2) {
printf("Usage: dhcp-test <interface index>\n");
exit(0);
}
- index = atoi(argv[1]);
+ ifindex = atoi(argv[1]);
- printf("Create DHCP client for interface %d\n", index);
+ printf("Create DHCP client for interface %d\n", ifindex);
- dhcp_client = g_dhcp_client_new(G_DHCP_IPV4, index, &error);
+ dhcp_client = g_dhcp_client_new(G_DHCP_IPV4, ifindex, &error);
if (dhcp_client == NULL) {
handle_error(error);
exit(0);
diff --git a/tools/resolv-test.c b/tools/resolv-test.c
index 9867a4b..bc0b5b8 100644
--- a/tools/resolv-test.c
+++ b/tools/resolv-test.c
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
GError *error = NULL;
struct sigaction sa;
GResolv *resolv;
- int index = 0;
+ int ifindex = 0;
context = g_option_context_new(NULL);
g_option_context_add_main_entries(context, options, NULL);
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
return 1;
}
- resolv = g_resolv_new(index);
+ resolv = g_resolv_new(ifindex);
if (resolv == NULL) {
printf("failed to create resolver\n");
return 1;
diff --git a/tools/supplicant.c b/tools/supplicant.c
index 1c96823..41b8b4c 100644
--- a/tools/supplicant.c
+++ b/tools/supplicant.c
@@ -979,9 +979,9 @@ static void bss_property(const char *key, DBusMessageIter
*iter,
dbus_message_iter_get_basic(iter, &frequency);
bss->frequency = frequency;
} else if (g_strcmp0(key, "Signal") == 0) {
- dbus_int16_t signal = 0;
+ dbus_int16_t dbus_signal = 0;
- dbus_message_iter_get_basic(iter, &signal);
+ dbus_message_iter_get_basic(iter, &dbus_signal);
} else if (g_strcmp0(key, "Level") == 0) {
dbus_int32_t level = 0;
diff --git a/tools/web-test.c b/tools/web-test.c
index a507397..e827c59 100644
--- a/tools/web-test.c
+++ b/tools/web-test.c
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
GError *error = NULL;
struct sigaction sa;
GWeb *web;
- int index = 0;
+ int ifindex = 0;
context = g_option_context_new(NULL);
g_option_context_add_main_entries(context, options, NULL);
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
return 1;
}
- web = g_web_new(index);
+ web = g_web_new(ifindex);
if (web == NULL) {
fprintf(stderr, "Failed to create web service\n");
return 1;
diff --git a/tools/wispr.c b/tools/wispr.c
index 122bea5..808c215 100644
--- a/tools/wispr.c
+++ b/tools/wispr.c
@@ -644,7 +644,7 @@ int main(int argc, char *argv[])
GError *error = NULL;
struct sigaction sa;
struct wispr_session wispr;
- int index = 0;
+ int ifindex = 0;
context = g_option_context_new(NULL);
g_option_context_add_main_entries(context, options, NULL);
@@ -663,7 +663,7 @@ int main(int argc, char *argv[])
memset(&wispr, 0, sizeof(wispr));
wispr_msg_init(&wispr.msg);
- wispr.web = g_web_new(index);
+ wispr.web = g_web_new(ifindex);
if (wispr.web == NULL) {
fprintf(stderr, "Failed to create web service\n");
return 1;
diff --git a/tools/wpad-test.c b/tools/wpad-test.c
index a6cc792..190a65f 100644
--- a/tools/wpad-test.c
+++ b/tools/wpad-test.c
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
GOptionContext *context;
GError *error = NULL;
struct sigaction sa;
- int index = 0;
+ int ifindex = 0;
context = g_option_context_new(NULL);
g_option_context_add_main_entries(context, options, NULL);
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
g_option_context_free(context);
- resolv = g_resolv_new(index);
+ resolv = g_resolv_new(ifindex);
if (resolv == NULL) {
g_printerr("Failed to create resolver\n");
return 1;
--
1.7.9.5
_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman
