GNOME.org
 

Shadow variables building NM-1.0.2 on RPi2

Thanks to dcbw on the IRC channel for helping with the build of verison 1.0.2

I'd a few shadow variables which I basically just changed the name to
something I was fairly confident wouldn't clash with anohter
variable. Basically that meant prepending the variable name with "jfw_" so the
variable "exit" became "jfw_exit".

I should probably repeat this exercise with the git repo so that I could make
a few simple patch files. Save that for tomrrow, as I'm still trying to get NM
working. I've another problem but I'll post another email on that.

John

clients/common/nm-secret-agent-simple.c:260:            int jfw_index;
clients/common/nm-secret-agent-simple.c:263:            jfw_index = 
nm_setting_wireless_security_get_wep_tx_keyidx (s_wsec);
clients/common/nm-secret-agent-simple.c:264:            key = g_strdup_printf ("wep-key%d", jfw_index);

clients/cli/connections.c:8484: gboolean jfw_remove = FALSE;
clients/cli/connections.c:8562:                 jfw_remove = TRUE;
clients/cli/connections.c:8602:         if (!jfw_remove) {

include/nm-test-utils.h:1034:   gs_unref_object NMConnection *jfw_clone = NULL;
include/nm-test-utils.h:1038:   jfw_clone = nm_simple_connection_new_clone (con);
include/nm-test-utils.h:1047:   nmtst_assert_connection_equals (con, FALSE, jfw_clone, FALSE);

libnm-core/nm-simple-connection.c:93:   NMConnection *jfw_clone;
libnm-core/nm-simple-connection.c:97:   jfw_clone = nm_simple_connection_new ();
libnm-core/nm-simple-connection.c:98:   nm_connection_set_path (jfw_clone, nm_connection_get_path 
(connection));
libnm-core/nm-simple-connection.c:99:   nm_connection_replace_settings_from_connection (jfw_clone, 
connection);
libnm-core/nm-simple-connection.c:101:  return jfw_clone;

libnm-core/nm-setting.c:938:    GObject *jfw_dup;
libnm-core/nm-setting.c:942:    jfw_dup = g_object_new (G_OBJECT_TYPE (setting), NULL);
libnm-core/nm-setting.c:944:    g_object_freeze_notify (jfw_dup);
libnm-core/nm-setting.c:945:    nm_setting_enumerate_values (setting, duplicate_setting, jfw_dup);
libnm-core/nm-setting.c:946:    g_object_thaw_notify (jfw_dup);
libnm-core/nm-setting.c:948:    return NM_SETTING (jfw_dup);

libnm-core/tests/test-general.c:2694:   GRand *jfw_rand = g_rand_new ();
libnm-core/tests/test-general.c:2696:   g_rand_set_seed (jfw_rand, 1);
libnm-core/tests/test-general.c:2705:                   guint32 r = g_rand_int (jfw_rand);
libnm-core/tests/test-general.c:2722:   g_rand_free (jfw_rand);

libnm-core/nm-utils.c:1978:nm_utils_uuid_generate_from_string (const char *s, gssize slen, int jfw_uuid_type, 
gpointer type_args)
libnm-core/nm-utils.c:1985:     g_return_val_if_fail (jfw_uuid_type == NM_UTILS_UUID_TYPE_LEGACY || 
jfw_uuid_type == NM_UTILS_UUID_TYPE_VARIANT3, NULL);
libnm-core/nm-utils.c:1986:     g_return_val_if_fail (!type_args || jfw_uuid_type == 
NM_UTILS_UUID_TYPE_VARIANT3, NULL);
libnm-core/nm-utils.c:1988:     switch (jfw_uuid_type) {

src/nm-manager.c:1789:  GSList *iter, *jfw_remove = NULL;
src/nm-manager.c:1806:                  jfw_remove = g_slist_prepend (jfw_remove, iter->data);
src/nm-manager.c:1808:  for (iter = jfw_remove; iter; iter = iter->next)
src/nm-manager.c:1810:  g_slist_free (jfw_remove);

src/platform/tests/test-link.c:482:     NMPlatformLink jfw_link;
src/platform/tests/test-link.c:499:     success = nm_platform_link_get (ifindex, &jfw_link);
src/platform/tests/test-link.c:501:     if (!jfw_link.driver) {

src/platform/nm-platform.c:504:nm_platform_link_get (int ifindex, NMPlatformLink *jfw_link)
src/platform/nm-platform.c:507: g_return_val_if_fail (jfw_link, FALSE);
src/platform/nm-platform.c:510: return !!klass->link_get (platform, ifindex, jfw_link);
src/platform/nm-platform.c:2328:nm_platform_link_to_string (const NMPlatformLink *jfw_link)
src/platform/nm-platform.c:2335:        if (!jfw_link)
src/platform/nm-platform.c:2339:        if (!jfw_link->arp)
src/platform/nm-platform.c:2341:        if (jfw_link->up)
src/platform/nm-platform.c:2345:        if (jfw_link->connected)
src/platform/nm-platform.c:2348:        if (jfw_link->master)
src/platform/nm-platform.c:2349:                g_snprintf (master, sizeof (master), " master %d", 
jfw_link->master);
src/platform/nm-platform.c:2353:        if (jfw_link->parent)
src/platform/nm-platform.c:2354:                g_snprintf (parent, sizeof (master), "@%d", jfw_link->parent);
src/platform/nm-platform.c:2358:        driver = jfw_link->driver ? g_strdup_printf (" driver '%s'", 
jfw_link->driver) : NULL;
src/platform/nm-platform.c:2359:        udi = jfw_link->udi ? g_strdup_printf (" udi '%s'", jfw_link->udi) : 
NULL;
src/platform/nm-platform.c:2360:        type = jfw_link->type_name ? NULL : g_strdup_printf ("(%d)", 
jfw_link->type);
src/platform/nm-platform.c:2363:                    jfw_link->ifindex, jfw_link->name, parent, str->str,
src/platform/nm-platform.c:2364:                    jfw_link->mtu, master, jfw_link->type_name ? 
jfw_link->type_name : type,

src/nm-default-route-manager.c:152:_vt_route_index (const VTableIP *vtable, GArray *routes, guint jfw_index)
src/nm-default-route-manager.c:155:             return (NMPlatformIPRoute *) &g_array_index (routes, 
NMPlatformIP4Route, jfw_index);
src/nm-default-route-manager.c:157:             return (NMPlatformIPRoute *) &g_array_index (routes, 
NMPlatformIP6Route, jfw_index);

src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c:156:sd_event_add_time(sd_event *e, sd_event_source **s, clockid_t 
jfw_clock, uint64_t usec, uint64_t accuracy, sd_event_time_handler_t callback, void *userdata)
src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c:159:        uint64_t n = now (jfw_clock);
src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c:199:sd_event_now (sd_event *e, clockid_t jfw_clock, uint64_t 
*usec)
src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c:201:        *usec = now (jfw_clock);

src/dhcp-manager/systemd-dhcp/src/shared/time-util.c:987:        static clockid_t jfw_clock = -1;
src/dhcp-manager/systemd-dhcp/src/shared/time-util.c:990:        if (jfw_clock != -1)
src/dhcp-manager/systemd-dhcp/src/shared/time-util.c:991:                return jfw_clock;
src/dhcp-manager/systemd-dhcp/src/shared/time-util.c:995:                jfw_clock = CLOCK_MONOTONIC;
src/dhcp-manager/systemd-dhcp/src/shared/time-util.c:998:                jfw_clock = CLOCK_BOOTTIME;
src/dhcp-manager/systemd-dhcp/src/shared/time-util.c:1001:        return jfw_clock;

src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:40:static int _bind_raw_socket(int 
ifindex, union sockaddr_union *jfw_link,
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:101:        assert(jfw_link);
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:115:        jfw_link->ll.sll_family = 
AF_PACKET;
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:116:        jfw_link->ll.sll_protocol = 
htons(ETH_P_IP);
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:117:        jfw_link->ll.sll_ifindex = 
ifindex;
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:118:        jfw_link->ll.sll_hatype = 
htons(arp_type);
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:119:        jfw_link->ll.sll_halen = 
mac_addr_len;
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:120:        memcpy(jfw_link->ll.sll_addr, 
bcast_addr, mac_addr_len);
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:122:        r = bind(s, &jfw_link->sa, 
sizeof(jfw_link->ll));
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:132:int dhcp_network_bind_raw_socket(int 
ifindex, union sockaddr_union *jfw_link,
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:159:        return 
_bind_raw_socket(ifindex, jfw_link, xid, mac_addr, mac_addr_len,
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:208:int dhcp_network_send_raw_socket(int 
s, const union sockaddr_union *jfw_link,
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:212:        assert(jfw_link);
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c:216:        r = sendto(s, packet, len, 0, 
&jfw_link->sa, sizeof(jfw_link->ll));

src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c:48:int 
dhcp_network_icmp6_bind_router_solicitation(int jfw_index)
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c:53:                .ipv6mr_interface = 
jfw_index,
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c:74:        r = setsockopt(s, 
IPPROTO_IPV6, IPV6_MULTICAST_IF, &jfw_index,
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c:75:                       
sizeof(jfw_index));
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c:138:int 
dhcp6_network_bind_udp_socket(int jfw_index, struct in6_addr *local_address) {
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c:140:                .ipi6_ifindex = 
jfw_index,

src/NetworkManagerUtils.c:289:_kc_exit_to_string (char *buf, int jfw_exit)
src/NetworkManagerUtils.c:290:#define _kc_exit_to_string(buf, jfw_exit) ( G_STATIC_ASSERT_EXPR(sizeof (buf) 
== KC_EXIT_TO_STRING_BUF_SIZE && sizeof ((buf)[0]) == 1), _kc_exit_to_string (buf, jfw_exit) )
src/NetworkManagerUtils.c:292:  if (WIFEXITED (jfw_exit))
src/NetworkManagerUtils.c:293:          g_snprintf (buf, KC_EXIT_TO_STRING_BUF_SIZE, "normally with status 
%d", WEXITSTATUS (jfw_exit));
src/NetworkManagerUtils.c:294:  else if (WIFSIGNALED (jfw_exit))
src/NetworkManagerUtils.c:295:          g_snprintf (buf, KC_EXIT_TO_STRING_BUF_SIZE, "by signal %d", WTERMSIG 
(jfw_exit));
src/NetworkManagerUtils.c:297:          g_snprintf (buf, KC_EXIT_TO_STRING_BUF_SIZE, "with unexpected status 
%d", jfw_exit);

src/vpn-manager/nm-vpn-connection.c:1549:       NMConnection *jfw_dup;
src/vpn-manager/nm-vpn-connection.c:1568:       jfw_dup = nm_simple_connection_new_clone (connection);
src/vpn-manager/nm-vpn-connection.c:1569:       g_assert (jfw_dup);
src/vpn-manager/nm-vpn-connection.c:1570:       s_vpn = nm_connection_get_setting_vpn (jfw_dup);
src/vpn-manager/nm-vpn-connection.c:1573:       dict = nm_connection_to_dbus (jfw_dup, 
NM_CONNECTION_SERIALIZE_ALL);
src/vpn-manager/nm-vpn-connection.c:1574:       g_object_unref (jfw_dup);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]