diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-06-26 19:56:52 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-06-26 19:56:52 +0000 |
| commit | ab797734ddebd50f40deae437f27392ca4651c92 (patch) | |
| tree | 82a95df0652f9df59634fd7a7f8dd36026fa4ea7 /epan/dissectors/packet-arp.h | |
| parent | 2b07720c2fde93c0ee91e88969e76493ee7f86de (diff) | |
| download | wireshark-ab797734ddebd50f40deae437f27392ca4651c92.tar.gz | |
Get rid of the private "my_match_strval()" routine in many dissectors;
add a "match_strval_idx()" routine that does the same thing, and have
"match_strval()" call it.
Make those routines, and "val_to_str()", return a "const" pointer.
Update dissectors as necessary to squelch compiler warnings produced by
that.
Use "val_to_str()" rather than using "match_strval()" and then, if the
result is null, substituting a specific string. Clean up some other
"match_strval()"/"val_to_str()" usages.
Add a null pointer check in the NDPS dissector's "attribute_value()"
routine, as it's not clear that "global_attribute_name" won't be null at
that point.
Make some global variables in the AFS4INT dissector local.
Make some routines not used outside the module they're in static.
Make some tables "static const".
Clean up white space.
Fix Gerald's address in some files.
svn path=/trunk/; revision=14786
Diffstat (limited to 'epan/dissectors/packet-arp.h')
| -rw-r--r-- | epan/dissectors/packet-arp.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-arp.h b/epan/dissectors/packet-arp.h index 782ac7fbf5..808cb83447 100644 --- a/epan/dissectors/packet-arp.h +++ b/epan/dissectors/packet-arp.h @@ -5,10 +5,9 @@ * $Id$ * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -28,7 +27,7 @@ #define __PACKET_ARP_H__ gchar *arphrdaddr_to_str(const guint8 *ad, int ad_len, guint16 type); -gchar *arphrdtype_to_str(guint16 hwtype, const char *fmt); +const gchar *arphrdtype_to_str(guint16 hwtype, const char *fmt); void dissect_atm_nsap(tvbuff_t *tvb, int offset, int len, proto_tree *tree); |