Commit a857d91d authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Samuel Thibault
Browse files

slirp: replace DEBUG_ARGS with DEBUG_ARG 



There is no clear benefit in calling an alias DEBUG_ARGS(). Replace
calls with DEBUG_ARG(), and fix the white-spacing while at it.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
parent eb0b1596

slirp/arp_table.c

+6 −6
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN]) 


    DEBUG_CALL("arp_table_add");

    DEBUG_ARG("ip = %s", inet_ntoa((struct in_addr){.s_addr = ip_addr}));

    DEBUG_ARGS(" hw addr = %02x:%02x:%02x:%02x:%02x:%02x\n",

    DEBUG_ARG("hw addr = %02x:%02x:%02x:%02x:%02x:%02x",

              ethaddr[0], ethaddr[1], ethaddr[2],

              ethaddr[3], ethaddr[4], ethaddr[5]);
@@ -79,7 +79,7 @@ bool arp_table_search(Slirp *slirp, uint32_t ip_addr, 
    for (i = 0; i < ARP_TABLE_SIZE; i++) {

        if (arptbl->table[i].ar_sip == ip_addr) {

            memcpy(out_ethaddr, arptbl->table[i].ar_sha,  ETH_ALEN);

            DEBUG_ARGS(" found hw addr = %02x:%02x:%02x:%02x:%02x:%02x\n",

            DEBUG_ARG("found hw addr = %02x:%02x:%02x:%02x:%02x:%02x",

                      out_ethaddr[0], out_ethaddr[1], out_ethaddr[2],

                      out_ethaddr[3], out_ethaddr[4], out_ethaddr[5]);

            return 1;

slirp/debug.h

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ extern int slirp_debug; 
    }                                           \

} while (0)



#define DEBUG_ARGS(fmt, ...) DEBUG_ARG(fmt, ##__VA_ARGS__)



#define DEBUG_MISC(fmt, ...) do {               \

    if (slirp_debug & DBG_MISC) {               \

        fprintf(dfd, fmt, ##__VA_ARGS__);       \

slirp/ip6_icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ void icmp6_send_error(struct mbuf *m, uint8_t type, uint8_t code) 
    char addrstr[INET6_ADDRSTRLEN];



    DEBUG_CALL("icmp6_send_error");

    DEBUG_ARGS(" type = %d, code = %d\n", type, code);

    DEBUG_ARG("type = %d, code = %d", type, code);



    if (IN6_IS_ADDR_MULTICAST(&ip->ip_src) ||

            in6_zero(&ip->ip_src)) {

slirp/ndp_table.c

+9 −9
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ void ndp_table_add(Slirp *slirp, struct in6_addr ip_addr, 


    DEBUG_CALL("ndp_table_add");

    DEBUG_ARG("ip = %s", addrstr);

    DEBUG_ARGS(" hw addr = %02x:%02x:%02x:%02x:%02x:%02x\n",

    DEBUG_ARG("hw addr = %02x:%02x:%02x:%02x:%02x:%02x",

              ethaddr[0], ethaddr[1], ethaddr[2],

              ethaddr[3], ethaddr[4], ethaddr[5]);
@@ -67,7 +67,7 @@ bool ndp_table_search(Slirp *slirp, struct in6_addr ip_addr, 
        out_ethaddr[3] = ip_addr.s6_addr[13];

        out_ethaddr[4] = ip_addr.s6_addr[14];

        out_ethaddr[5] = ip_addr.s6_addr[15];

        DEBUG_ARGS(" multicast addr = %02x:%02x:%02x:%02x:%02x:%02x\n",

        DEBUG_ARG("multicast addr = %02x:%02x:%02x:%02x:%02x:%02x",

                  out_ethaddr[0], out_ethaddr[1], out_ethaddr[2],

                  out_ethaddr[3], out_ethaddr[4], out_ethaddr[5]);

        return 1;
@@ -76,7 +76,7 @@ bool ndp_table_search(Slirp *slirp, struct in6_addr ip_addr, 
    for (i = 0; i < NDP_TABLE_SIZE; i++) {

        if (in6_equal(&ndp_table->table[i].ip_addr, &ip_addr)) {

            memcpy(out_ethaddr, ndp_table->table[i].eth_addr,  ETH_ALEN);

            DEBUG_ARGS(" found hw addr = %02x:%02x:%02x:%02x:%02x:%02x\n",

            DEBUG_ARG("found hw addr = %02x:%02x:%02x:%02x:%02x:%02x",

                      out_ethaddr[0], out_ethaddr[1], out_ethaddr[2],

                      out_ethaddr[3], out_ethaddr[4], out_ethaddr[5]);

            return 1;

slirp/slirp.c

+6 −6
Original line number Diff line number Diff line
@@ -992,10 +992,10 @@ int if_encap(Slirp *slirp, struct mbuf *ifm) 
    }



    memcpy(eh->h_dest, ethaddr, ETH_ALEN);

    DEBUG_ARGS(" src = %02x:%02x:%02x:%02x:%02x:%02x\n",

    DEBUG_ARG("src = %02x:%02x:%02x:%02x:%02x:%02x",

              eh->h_source[0], eh->h_source[1], eh->h_source[2],

              eh->h_source[3], eh->h_source[4], eh->h_source[5]);

    DEBUG_ARGS(" dst = %02x:%02x:%02x:%02x:%02x:%02x\n",

    DEBUG_ARG("dst = %02x:%02x:%02x:%02x:%02x:%02x",

              eh->h_dest[0], eh->h_dest[1], eh->h_dest[2],

              eh->h_dest[3], eh->h_dest[4], eh->h_dest[5]);

    memcpy(buf + sizeof(struct ethhdr), ifm->m_data, ifm->m_len);