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-dcerpc-rs_pgo.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-dcerpc-rs_pgo.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-rs_pgo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c index fe2b403319..70219453c9 100644 --- a/epan/dissectors/packet-dcerpc-rs_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_pgo.c @@ -127,7 +127,6 @@ static gint ett_rs_pgo_id_key_t = -1; static gint ett_rs_pgo_unix_num_key_t = -1; static gint ett_rs_pgo_query_result_t = -1; static gint ett_rs_pgo_result_t = -1; -static guint8 *st_str; #define sec_rgy_acct_admin_valid 0x1 @@ -176,6 +175,7 @@ dissect_error_status_t (tvbuff_t * tvb, int offset, int old_offset = offset; guint32 st; dcerpc_info *di; + const char *st_str; di = pinfo->private_data; if (di->conformant_run) @@ -1001,7 +1001,7 @@ dissect_rs_pgo_query_result_t (tvbuff_t * tvb, int offset, int old_offset = offset; guint32 st; dcerpc_info *di; - guint8 *status; + const char *status; #define error_status_ok 0 /* |