Use __func__ from C99 in error messages. [skip ci]

This automatically fixes a few error messages that would tell an
incorrect function name.

diff --git a/addrtoname.c b/addrtoname.c
index ce81207815ebef62d0432e74e3bc27a74fe85d77..9891a7adc28dd70a205b2977a5e70a0107abbd00 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -319,7 +319,7 @@ ipaddr_string(netdissect_options *ndo, const u_char *ap)
                        p->name = strdup(hp->h_name);
                        if (p->name == NULL)
                                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                       "ipaddr_string: strdup(hp->h_name)");
+                                       "%s: strdup(hp->h_name)", __func__);
                        if (ndo->ndo_Nflag) {
                                /* Remove domain qualifications */
                                dotp = strchr(p->name, '.');
@@ -332,7 +332,7 @@ ipaddr_string(netdissect_options *ndo, const u_char *ap)
        p->name = strdup(intoa(addr));
        if (p->name == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "ipaddr_string: strdup(intoa(addr))");
+                                 "%s: strdup(intoa(addr))", __func__);
        return (p->name);
 }
 
@@ -382,7 +382,7 @@ ip6addr_string(netdissect_options *ndo, const u_char *ap)
                        p->name = strdup(hp->h_name);
                        if (p->name == NULL)
                                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                       "ip6addr_string: strdup(hp->h_name)");
+                                       "%s: strdup(hp->h_name)", __func__);
                        if (ndo->ndo_Nflag) {
                                /* Remove domain qualifications */
                                dotp = strchr(p->name, '.');
@@ -396,7 +396,7 @@ ip6addr_string(netdissect_options *ndo, const u_char *ap)
        p->name = strdup(cp);
        if (p->name == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "ip6addr_string: strdup(cp)");
+                                 "%s: strdup(cp)", __func__);
        return (p->name);
 }
 
@@ -462,7 +462,7 @@ lookup_emem(netdissect_options *ndo, const u_char *ep)
        tp->e_addr2 = (u_short)k;
        tp->e_nxt = (struct enamemem *)calloc(1, sizeof(*tp));
        if (tp->e_nxt == NULL)
-               (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "lookup_emem: calloc");
+               (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "%s: calloc", __func__);
 
        return tp;
 }
@@ -508,14 +508,14 @@ lookup_bytestring(netdissect_options *ndo, const u_char *bs,
        tp->bs_bytes = (u_char *) calloc(1, nlen);
        if (tp->bs_bytes == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "lookup_bytestring: calloc");
+                                 "%s: calloc", __func__);
 
        memcpy(tp->bs_bytes, bs, nlen);
        tp->bs_nbytes = nlen;
        tp->bs_nxt = (struct bsnamemem *)calloc(1, sizeof(*tp));
        if (tp->bs_nxt == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "lookup_bytestring: calloc");
+                                 "%s: calloc", __func__);
 
        return tp;
 }
@@ -555,12 +555,12 @@ lookup_nsap(netdissect_options *ndo, const u_char *nsap,
        tp->e_addr2 = (u_short)k;
        tp->e_nsap = (u_char *)malloc(nsap_length + 1);
        if (tp->e_nsap == NULL)
-               (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "lookup_nsap: malloc");
+               (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "%s: malloc", __func__);
        tp->e_nsap[0] = (u_char)nsap_length;    /* guaranteed < ISONSAP_MAX_LENGTH */
        memcpy((char *)&tp->e_nsap[1], (const char *)nsap, nsap_length);
        tp->e_nxt = (struct enamemem *)calloc(1, sizeof(*tp));
        if (tp->e_nxt == NULL)
-               (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "lookup_nsap: calloc");
+               (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "%s: calloc", __func__);
 
        return tp;
 }
@@ -588,7 +588,7 @@ lookup_protoid(netdissect_options *ndo, const u_char *pi)
        tp->p_proto = (u_short)j;
        tp->p_nxt = (struct protoidmem *)calloc(1, sizeof(*tp));
        if (tp->p_nxt == NULL)
-               (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "lookup_protoid: calloc");
+               (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "%s: calloc", __func__);
 
        return tp;
 }
@@ -613,7 +613,7 @@ etheraddr_string(netdissect_options *ndo, const uint8_t *ep)
                        tp->e_name = strdup(buf2);
                        if (tp->e_name == NULL)
                                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                       "etheraddr_string: strdup(buf2)");
+                                       "%s: strdup(buf2)", __func__);
                        return (tp->e_name);
                }
        }
@@ -634,7 +634,7 @@ etheraddr_string(netdissect_options *ndo, const uint8_t *ep)
        tp->e_name = strdup(buf);
        if (tp->e_name == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "etheraddr_string: strdup(buf)");
+                                 "%s: strdup(buf)", __func__);
        return (tp->e_name);
 }
 
@@ -663,7 +663,7 @@ le64addr_string(netdissect_options *ndo, const uint8_t *ep)
        tp->bs_name = strdup(buf);
        if (tp->bs_name == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "le64addr_string: strdup(buf)");
+                                 "%s: strdup(buf)", __func__);
 
        return (tp->bs_name);
 }
@@ -692,7 +692,7 @@ linkaddr_string(netdissect_options *ndo, const uint8_t *ep,
        tp->bs_name = cp = (char *)malloc(len*3);
        if (tp->bs_name == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "linkaddr_string: malloc");
+                                 "%s: malloc", __func__);
        cp = octet_to_hex(cp, *ep++);
        for (i = len-1; i > 0 ; --i) {
                *cp++ = ':';
@@ -721,7 +721,7 @@ isonsap_string(netdissect_options *ndo, const uint8_t *nsap,
        tp->e_name = cp = (char *)malloc(sizeof("xx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xx"));
        if (cp == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "isonsap_string: malloc");
+                                 "%s: malloc", __func__);
 
        for (nsap_idx = 0; nsap_idx < nsap_length; nsap_idx++) {
                cp = octet_to_hex(cp, *nsap++);
@@ -752,7 +752,7 @@ tcpport_string(netdissect_options *ndo, u_short port)
        tp->name = strdup(buf);
        if (tp->name == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "tcpport_string: strdup(buf)");
+                                 "%s: strdup(buf)", __func__);
        return (tp->name);
 }
 
@@ -774,7 +774,7 @@ udpport_string(netdissect_options *ndo, u_short port)
        tp->name = strdup(buf);
        if (tp->name == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "udpport_string: strdup(buf)");
+                                 "%s: strdup(buf)", __func__);
        return (tp->name);
 }
 
@@ -803,7 +803,7 @@ ipxsap_string(netdissect_options *ndo, u_short port)
        tp->name = strdup(buf);
        if (tp->name == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "ipxsap_string: strdup(buf)");
+                                 "%s: strdup(buf)", __func__);
        return (tp->name);
 }
 
@@ -834,7 +834,7 @@ init_servarray(netdissect_options *ndo)
                        table->name = strdup(sv->s_name);
                if (table->name == NULL)
                        (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                         "init_servarray: strdup");
+                                         "%s: strdup", __func__);
 
                table->addr = port;
                table->nxt = newhnamemem(ndo);
@@ -913,7 +913,7 @@ init_protoidarray(netdissect_options *ndo)
                tp->p_name = strdup(eproto_db[i].s);
                if (tp->p_name == NULL)
                        (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                               "init_protoidarray: strdup(eproto_db[i].s)");
+                               "%s: strdup(eproto_db[i].s)", __func__);
        }
        /* Hardwire some SNAP proto ID names */
        for (pl = protoidlist; pl->name != NULL; ++pl) {
@@ -967,7 +967,7 @@ init_etherarray(netdissect_options *ndo)
                        tp->e_name = strdup(ep->name);
                        if (tp->e_name == NULL)
                                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                       "init_etherarray: strdup(ep->addr)");
+                                       "%s: strdup(ep->addr)", __func__);
                }
                (void)fclose(fp);
        }
@@ -988,7 +988,7 @@ init_etherarray(netdissect_options *ndo)
                        tp->e_name = strdup(name);
                        if (tp->e_name == NULL)
                                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                       "init_etherarray: strdup(name)");
+                                       "%s: strdup(name)", __func__);
                        continue;
                }
 #endif
@@ -1289,7 +1289,7 @@ newhnamemem(netdissect_options *ndo)
                ptr = (struct hnamemem *)calloc(num, sizeof (*ptr));
                if (ptr == NULL)
                        (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                         "newhnamemem: calloc");
+                                         "%s: calloc", __func__);
        }
        --num;
        p = ptr++;
@@ -1309,7 +1309,7 @@ newh6namemem(netdissect_options *ndo)
                ptr = (struct h6namemem *)calloc(num, sizeof (*ptr));
                if (ptr == NULL)
                        (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                         "newh6namemem: calloc");
+                                         "%s: calloc", __func__);
        }
        --num;
        p = ptr++;

diff --git a/print-atalk.c b/print-atalk.c
index 1f2af363c21cb3a3535a88b74abb487f70da317c..c921dc1a7d166cfc5d278fa459c791eb16af3918 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -636,7 +636,7 @@ ataddr_string(netdissect_options *ndo,
                                        if (tp->name == NULL)
                                                (*ndo->ndo_error)(ndo,
                                                    S_ERR_ND_MEM_ALLOC,
-                                                   "ataddr_string: strdup(nambuf)");
+                                                   "%s: strdup(nambuf)", __func__);
                                }
                                fclose(fp);
                        }
@@ -661,7 +661,7 @@ ataddr_string(netdissect_options *ndo,
                        tp->name = strdup(nambuf);
                        if (tp->name == NULL)
                                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                       "ataddr_string: strdup(nambuf)");
+                                       "%s: strdup(nambuf)", __func__);
                        return (tp->name);
                }
 
@@ -674,7 +674,7 @@ ataddr_string(netdissect_options *ndo,
        tp->name = strdup(nambuf);
        if (tp->name == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "ataddr_string: strdup(nambuf)");
+                                 "%s: strdup(nambuf)", __func__);
 
        return (tp->name);
 }

diff --git a/print-decnet.c b/print-decnet.c
index e388122fa8762a1a8f5a619ca50445c6f2699771..500cca35fc16bfbc650fe07191ec8822d4646883 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -1211,7 +1211,7 @@ dnnum_string(netdissect_options *ndo, u_short dnaddr)
        /* malloc() return used by the 'dnaddrtable' hash table: do not free() */
        str = (char *)malloc(siz = sizeof("00.0000"));
        if (str == NULL)
-               (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "dnnum_string: malloc");
+               (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, "%s: malloc", __func__);
        snprintf(str, siz, "%u.%u", area, node);
        return(str);
 }

diff --git a/print-esp.c b/print-esp.c
index 14885d6b693b3ad088e8d462b3d5cd72123ca6df..8b664b61ec8115da255684cd42dceb30e5de5b18 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -347,7 +347,7 @@ static void esp_print_addsa(netdissect_options *ndo,
        nsa = (struct sa_list *)malloc(sizeof(struct sa_list));
        if (nsa == NULL)
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                                 "esp_print_addsa: malloc");
+                                 "%s: malloc", __func__);
 
        *nsa = *sa;
 
@@ -603,8 +603,8 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line,
                secretfile = fopen(filename, FOPEN_READ_TXT);
                if (secretfile == NULL) {
                        (*ndo->ndo_error)(ndo, S_ERR_ND_OPEN_FILE,
-                                         "print_esp: can't open %s: %s\n",
-                                         filename, strerror(errno));
+                                         "%s: can't open %s: %s\n",
+                                         __func__, filename, strerror(errno));
                }
 
                while (fgets(fileline, sizeof(fileline)-1, secretfile) != NULL) {
@@ -880,7 +880,7 @@ esp_print(netdissect_options *ndo,
        if (!nd_push_buffer(ndo, pt, pt, ep)) {
                free(pt);
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-                       "esp_print: can't push buffer on buffer stack");
+                       "%s: can't push buffer on buffer stack", __func__);
        }
 
        /*

diff --git a/print-tcp.c b/print-tcp.c
index ff5279c3ad84db7f9ebd428e9179ce04c0f9db4c..a1aae18a8f23b1ab615c14099bfb2a577f2dfd6e 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -298,7 +298,7 @@ tcp_print(netdissect_options *ndo,
                                         if (th->nxt == NULL)
                                                 (*ndo->ndo_error)(ndo,
                                                         S_ERR_ND_MEM_ALLOC,
-                                                        "tcp_print: calloc");
+                                                        "%s: calloc", __func__);
                                 }
                                 th->addr = tha;
                                 if (rev)
@@ -356,7 +356,7 @@ tcp_print(netdissect_options *ndo,
                                         if (th->nxt == NULL)
                                                 (*ndo->ndo_error)(ndo,
                                                         S_ERR_ND_MEM_ALLOC,
-                                                        "tcp_print: calloc");
+                                                        "%s: calloc", __func__);
                                 }
                                 th->addr = tha;
                                 if (rev)

diff --git a/tcpdump.c b/tcpdump.c
index 16b7962bfc797e0ec457b53f0784297b813e34dd..658d8b34ec0124ebfc289f5edbe0a49089cd9d82 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -842,7 +842,7 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
 {
         char *filename = malloc(PATH_MAX + 1);
         if (filename == NULL)
-            error("Makefilename: malloc");
+            error("%s: malloc", __func__);
 
         /* Process with strftime if Gflag is set. */
         if (Gflag != 0) {
@@ -850,7 +850,7 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
 
           /* Convert Gflag_time to a usable format */
           if ((local_tm = localtime(&Gflag_time)) == NULL) {
-                  error("MakeTimedFilename: localtime");
+                  error("%s: localtime", __func__);
           }
 
           /* There's no good way to detect an error in strftime since a return
@@ -1036,7 +1036,7 @@ copy_argv(char **argv)
 
        buf = (char *)malloc(len);
        if (buf == NULL)
-               error("copy_argv: malloc");
+               error("%s: malloc", __func__);
 
        p = argv;
        dst = buf;
@@ -1641,8 +1641,8 @@ main(int argc, char **argv)
 
                        /* Grab the current time for rotation use. */
                        if ((Gflag_time = time(NULL)) == (time_t)-1) {
-                               error("main: can't get current time: %s",
-                                   pcap_strerror(errno));
+                               error("%s: can't get current time: %s",
+                                   __func__, pcap_strerror(errno));
                        }
                        break;
 
@@ -2849,8 +2849,8 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
 
                /* Get the current time */
                if ((t = time(NULL)) == (time_t)-1) {
-                       error("dump_and_trunc_packet: can't get current_time: %s",
-                           pcap_strerror(errno));
+                       error("%s: can't get current_time: %s",
+                           __func__, pcap_strerror(errno));
                }
 
 
@@ -2991,7 +2991,7 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
                                free(dump_info->CurrentFileName);
                        dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);
                        if (dump_info->CurrentFileName == NULL)
-                               error("dump_packet_and_trunc: malloc");
+                               error("%s: malloc", __func__);
                        MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars);
 #ifdef HAVE_LIBCAP_NG
                        capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE);