Printers must use ndo_error() function (via ndo->ndo_error)

diff --git a/addrtoname.c b/addrtoname.c
index 551ebb902069c9d99d1a2366c8853875f12c46b3..96af9e112236abcc4a8f3c2970f57f0918c421ce 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -1190,9 +1190,9 @@ dnaddr_string(netdissect_options *ndo, u_short dnaddr)
        tp->addr = dnaddr;
        tp->nxt = newhnamemem();
        if (ndo->ndo_nflag)
-               tp->name = dnnum_string(dnaddr);
+               tp->name = dnnum_string(ndo, dnaddr);
        else
-               tp->name = dnname_string(dnaddr);
+               tp->name = dnname_string(ndo, dnaddr);
 
        return(tp->name);
 }

diff --git a/netdissect.h b/netdissect.h
index 3b176b0791744d95d5029a4461fa9ee59579edc0..d69ad6110aff7d395844774f1efa384139e6277d 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -323,8 +323,8 @@ extern int unaligned_memcmp(const void *, const void *, size_t);
 #define PLURAL_SUFFIX(n) \
        (((n) != 1) ? "s" : "")
 
-extern const char *dnname_string(u_short);
-extern const char *dnnum_string(u_short);
+extern const char *dnname_string(netdissect_options *, u_short);
+extern const char *dnnum_string(netdissect_options *, u_short);
 
 extern int mask2plen(uint32_t);
 extern const char *tok2strary_internal(const char **, int, const char *, int);

diff --git a/print-atalk.c b/print-atalk.c
index 09c0ff43b1e88d73722976c6af98de5826e7328c..6940d39353940e89b8c44e2ea07bdf5de1bdbf76 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -569,7 +569,8 @@ ataddr_string(netdissect_options *ndo,
                        tp->nxt = newhnamemem();
                        tp->name = strdup(nambuf);
                        if (tp->name == NULL)
-                               error("ataddr_string: strdup(nambuf)");
+                               (*ndo->ndo_error)(ndo,
+                                                 "ataddr_string: strdup(nambuf)");
                }
                fclose(fp);
        }
@@ -588,7 +589,8 @@ ataddr_string(netdissect_options *ndo,
                            tp2->name, athost);
                        tp->name = strdup(nambuf);
                        if (tp->name == NULL)
-                               error("ataddr_string: strdup(nambuf)");
+                               (*ndo->ndo_error)(ndo,
+                                                 "ataddr_string: strdup(nambuf)");
                        return (tp->name);
                }
 
@@ -600,7 +602,7 @@ ataddr_string(netdissect_options *ndo,
                (void)snprintf(nambuf, sizeof(nambuf), "%d", atnet);
        tp->name = strdup(nambuf);
        if (tp->name == NULL)
-               error("ataddr_string: strdup(nambuf)");
+               (*ndo->ndo_error)(ndo, "ataddr_string: strdup(nambuf)");
 
        return (tp->name);
 }

diff --git a/print-decnet.c b/print-decnet.c
index 37ff04b527b2188abe75e01ea80d6f568385c657..e94cc6b9df7bb37efa76a14c6c3e9dc1019efe11 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -1295,7 +1295,7 @@ print_reason(netdissect_options *ndo,
 }
 
 const char *
-dnnum_string(u_short dnaddr)
+dnnum_string(netdissect_options *ndo, u_short dnaddr)
 {
        char *str;
        size_t siz;
@@ -1304,13 +1304,13 @@ dnnum_string(u_short dnaddr)
 
        str = (char *)malloc(siz = sizeof("00.0000"));
        if (str == NULL)
-               error("dnnum_string: malloc");
+               (*ndo->ndo_error)(ndo, "dnnum_string: malloc");
        snprintf(str, siz, "%d.%d", area, node);
        return(str);
 }
 
 const char *
-dnname_string(u_short dnaddr)
+dnname_string(netdissect_options *ndo, u_short dnaddr)
 {
 #ifdef HAVE_DNET_HTOA
        struct dn_naddr dna;
@@ -1322,9 +1322,9 @@ dnname_string(u_short dnaddr)
        if(dnname != NULL)
                return (strdup(dnname));
        else
-               return(dnnum_string(dnaddr));
+               return(dnnum_string(ndo, dnaddr));
 #else
-       return(dnnum_string(dnaddr));   /* punt */
+       return(dnnum_string(ndo, dnaddr));      /* punt */
 #endif
 }
 

diff --git a/print-tcp.c b/print-tcp.c
index 0cc338d6d1862e67861edf7c7c193d80826e38bc..5374e8a45f1a1e3b93182abe4ad94783ee4711e7 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -287,7 +287,8 @@ tcp_print(netdissect_options *ndo,
                                         th->nxt = (struct tcp_seq_hash6 *)
                                                 calloc(1, sizeof(*th));
                                         if (th->nxt == NULL)
-                                                error("tcp_print: calloc");
+                                                (*ndo->ndo_error)(ndo,
+                                                                 "tcp_print: calloc");
                                 }
                                 th->addr = tha;
                                 if (rev)
@@ -343,7 +344,8 @@ tcp_print(netdissect_options *ndo,
                                         th->nxt = (struct tcp_seq_hash *)
                                                 calloc(1, sizeof(*th));
                                         if (th->nxt == NULL)
-                                                error("tcp_print: calloc");
+                                                (*ndo->ndo_error)(ndo,
+                                                                 "tcp_print: calloc");
                                 }
                                 th->addr = tha;
                                 if (rev)