diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-08-10 22:55:02 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-08-10 22:55:02 +0000 |
| commit | 638d74d43f9baf45dc3641939eec36f801414187 (patch) | |
| tree | 5bfcabbb83a6e7359cfc302cdc604264560d66a0 /epan/dissectors/packet-ipp.c | |
| parent | e6ffe7b59b9f36c534d3b2d6cc78b05dfe517f67 (diff) | |
Use val_to_str_const() where appropriate;
Also (for a few files):
- create/use some extended value strings;
- remove unneeded #include files;
- remove unneeded variable initialization;
- re-order fcns slightly so prefs_reg_handoff...() at end, etc
svn path=/trunk/; revision=44438
Diffstat (limited to 'epan/dissectors/packet-ipp.c')
| -rw-r--r-- | epan/dissectors/packet-ipp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 7f8165e273..39928d11d7 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -515,18 +515,18 @@ add_integer_tree(proto_tree *tree, tvbuff_t *tvb, int offset, 1 + 2 + name_length + 2 + value_length, "%s: %s", format_text(name_val, name_length), - val_to_str(tvb_get_ntohl(tvb, offset + 1 + 2 + name_length + 2), - printer_state_vals, - "Unknown Printer State")); + val_to_str_const(tvb_get_ntohl(tvb, offset + 1 + 2 + name_length + 2), + printer_state_vals, + "Unknown Printer State")); } else if ((name_length > 5) && name_val && !tvb_memeql(tvb, offset + 1 + 2, "job-state", 9)) { ti = proto_tree_add_text(tree, tvb, offset, 1 + 2 + name_length + 2 + value_length, "%s: %s", format_text(name_val, name_length), - val_to_str(tvb_get_ntohl(tvb, offset + 1 + 2 + name_length + 2), - job_state_vals, - "Unknown Job State")); + val_to_str_const(tvb_get_ntohl(tvb, offset + 1 + 2 + name_length + 2), + job_state_vals, + "Unknown Job State")); } else { ti = proto_tree_add_text(tree, tvb, offset, |