arpd/arpd-__function__-is-not-standard.patch

   1 --- arpd.c.orig 2010-12-18 00:28:38.185356712 +0100
   2 +++ arpd.c      2010-12-18 00:32:57.365497111 +0100
   3 @@ -265,7 +265,7 @@
   4             spa->addr_ip, tha->addr_eth, tpa->addr_ip);
   5
   6         if (op == ARP_OP_REQUEST) {
   7 -               syslog(LOG_DEBUG, __FUNCTION__ ": who-has %s tell %s",
   8 +               syslog(LOG_DEBUG, "%s: who-has %s tell %s", __func__,
   9                     addr_ntoa(tpa), addr_ntoa(spa));
  10         } else if (op == ARP_OP_REPLY) {
  11                 syslog(LOG_INFO, "arp reply %s is-at %s",
  12 @@ -282,7 +282,7 @@
  13         int error;
  14
  15         if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) {
  16 -               syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
  17 +               syslog(LOG_DEBUG, "%s: %s at %s", __func__,
  18                     addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr));
  19                 return (0);
  20         }
  21 @@ -291,10 +291,10 @@
  22         error = arp_get(arpd_arp, &arpent);
  23
  24         if (error == -1) {
  25 -               syslog(LOG_DEBUG, __FUNCTION__ ": no entry for %s",
  26 +               syslog(LOG_DEBUG, "%s: no entry for %s", __func__,
  27                     addr_ntoa(addr));
  28         } else {
  29 -               syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
  30 +               syslog(LOG_DEBUG, "%s: %s at %s", __func__,
  31                     addr_ntoa(addr), addr_ntoa(&arpent.arp_ha));
  32         }
  33         return (error);
  34 @@ -315,7 +315,7 @@
  35         struct arp_req *req = arg;
  36
  37         SPLAY_REMOVE(tree, &arpd_reqs, req);
  38 -       syslog(LOG_DEBUG, "%s: expiring %s",__FUNCTION__, addr_ntoa(&req->pa));
  39 +       syslog(LOG_DEBUG, "%s: expiring %s",__func__, addr_ntoa(&req->pa));
  40         arpd_free(req);
  41  }
  42
  43 @@ -400,7 +400,7 @@
  44
  45                         if (req->negative) {
  46                                 syslog(LOG_DEBUG, "%s: %s is allocated",
  47 -                                   __FUNCTION__, addr_ntoa(&req->pa));
  48 +                                   __func__, addr_ntoa(&req->pa));
  49                                 return;
  50                         }
  51
  52 @@ -411,7 +411,7 @@
  53                         } else {
  54                                 syslog(LOG_DEBUG,
  55                                     "%s: %s still discovering (%d)",
  56 -                                   __FUNCTION__, addr_ntoa(&req->pa),
  57 +                                   __func__, addr_ntoa(&req->pa),
  58                                     req->cnt);
  59                         }
  60                 }
  61 @@ -423,7 +423,7 @@
  62                 if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) {
  63                         addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS,
  64                             ethip->ar_sha, ETH_ADDR_LEN);
  65 -                       syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
  66 +                       syslog(LOG_DEBUG, "%s: %s at %s", __func__,
  67                             addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha));
  68
  69                         /* This address is claimed */