colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: don't shadow basename (2)

Browse Source
This commit is contained in:
Dan Williams
2009-04-21 18:29:44 -04:00
parent ba5a7024bd
commit b87c5495ea
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libnm-util/tests/test-settings-defaults.c
View File

@@ -104,7 +104,7 @@ int main (int argc, char **argv)
{ {
GError *error = NULL; GError *error = NULL;
DBusGConnection *bus; DBusGConnection *bus;
char *basename; char *base;
g_type_init (); g_type_init ();
bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
@@ -127,9 +127,9 @@ int main (int argc, char **argv)
test_defaults (NM_TYPE_SETTING_WIRELESS, NM_SETTING_WIRELESS_SETTING_NAME); test_defaults (NM_TYPE_SETTING_WIRELESS, NM_SETTING_WIRELESS_SETTING_NAME);
test_defaults (NM_TYPE_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME); test_defaults (NM_TYPE_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME);
basename = g_path_get_basename (argv[0]); base = g_path_get_basename (argv[0]);
fprintf (stdout, "%s: SUCCESS\n", basename); fprintf (stdout, "%s: SUCCESS\n", base);
g_free (basename); g_free (base);
return 0; return 0;
} }

8
src/tests/test-dhcp-options.c
View File

@@ -583,7 +583,7 @@ int main (int argc, char **argv)
{ {
GError *error = NULL; GError *error = NULL;
DBusGConnection *bus; DBusGConnection *bus;
char *basename; char *base;
g_type_init (); g_type_init ();
bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
@@ -602,9 +602,9 @@ int main (int argc, char **argv)
test_escaped_domain_searches (); test_escaped_domain_searches ();
test_invalid_escaped_domain_searches (); test_invalid_escaped_domain_searches ();
basename = g_path_get_basename (argv[0]); base = g_path_get_basename (argv[0]);
fprintf (stdout, "%s: SUCCESS\n", basename); fprintf (stdout, "%s: SUCCESS\n", base);
g_free (basename); g_free (base);
return 0; return 0;
} }

8
system-settings/plugins/keyfile/tests/test-keyfile.c
View File

@@ -670,7 +670,7 @@ int main (int argc, char **argv)
{ {
GError *error = NULL; GError *error = NULL;
DBusGConnection *bus; DBusGConnection *bus;
char *basename; char *base;
g_type_init (); g_type_init ();
bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
@@ -685,9 +685,9 @@ int main (int argc, char **argv)
test_read_valid_wireless_connection (); test_read_valid_wireless_connection ();
test_write_wireless_connection (); test_write_wireless_connection ();
basename = g_path_get_basename (argv[0]); base = g_path_get_basename (argv[0]);
fprintf (stdout, "%s: SUCCESS\n", basename); fprintf (stdout, "%s: SUCCESS\n", base);
g_free (basename); g_free (base);
return 0; return 0;
} }