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-pppoe.c | |
parent | 2b07720c2fde93c0ee91e88969e76493ee7f86de (diff) |
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-pppoe.c')
-rw-r--r-- | epan/dissectors/packet-pppoe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index 9ab20c93d4..9f540c58fe 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -60,7 +60,7 @@ static dissector_handle_t ppp_handle; #define PPPOE_TAG_AC_ERR 0x0202 #define PPPOE_TAG_GENERIC_ERR 0x0203 -static gchar * +static const gchar * pppoecode_to_str(guint8 codetype, const char *fmt) { static const value_string code_vals[] = { {PPPOE_CODE_SESSION, "Session Data" }, @@ -74,7 +74,7 @@ pppoecode_to_str(guint8 codetype, const char *fmt) { return val_to_str(codetype, code_vals, fmt); } -static gchar * +static const gchar * pppoetag_to_str(guint16 tag_type, const char *fmt) { static const value_string code_vals[] = { {PPPOE_TAG_EOL, "End-Of-List" }, |