diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2012-09-24 10:34:27 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2012-09-24 10:34:27 +0000 |
| commit | 516f0c6e5cdb1f797b9b1fea2b5dd76be1d64e53 (patch) | |
| tree | b7b657856994a943b71d7c0ccaaee95fcdbbd4b7 /epan/dissectors/packet-catapult-dct2000.c | |
| parent | 5809e2cfdfd0c2480aa6ca45e2f020f879ef0752 (diff) | |
| download | wireshark-516f0c6e5cdb1f797b9b1fea2b5dd76be1d64e53.tar.gz wireshark-516f0c6e5cdb1f797b9b1fea2b5dd76be1d64e53.tar.bz2 wireshark-516f0c6e5cdb1f797b9b1fea2b5dd76be1d64e53.zip | |
Also avoid some unnecessary calls to strcmp() here, where the release
number at the end isn't important to know.
svn path=/trunk/; revision=45092
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 8b893f08c2..658df19f60 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -1326,11 +1326,7 @@ static dissector_handle_t look_for_dissector(const char *protocol_name) } else if ((strcmp(protocol_name, "fp") == 0) || - (strcmp(protocol_name, "fp_r4") == 0) || - (strcmp(protocol_name, "fp_r5") == 0) || - (strcmp(protocol_name, "fp_r6") == 0) || - (strcmp(protocol_name, "fp_r7") == 0) || - (strcmp(protocol_name, "fp_r8") == 0) || + (strncmp(protocol_name, "fp_r", 4) == 0) || (strcmp(protocol_name, "fpiur_r5") == 0)) { return find_dissector("fp"); @@ -2214,11 +2210,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* FP protocols need info from outhdr attached */ if ((strcmp(protocol_name, "fp") == 0) || - (strcmp(protocol_name, "fp_r4") == 0) || - (strcmp(protocol_name, "fp_r5") == 0) || - (strcmp(protocol_name, "fp_r6") == 0) || - (strcmp(protocol_name, "fp_r7") == 0) || - (strcmp(protocol_name, "fp_r8") == 0) || + (strncmp(protocol_name, "fp_r", 4) == 0) || (strcmp(protocol_name, "fpiur_r5") == 0)) { parse_outhdr_string(outhdr_string, outhdr_length); |