aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-06-17 23:42:13 +0000
committerGuy Harris <guy@alum.mit.edu>2017-06-17 23:42:19 +0000
commite77817cc92e368f13ac0cbee456fadb326d3a571 (patch)
tree0518cfce95e765707ae85e92324f4b14a02467f7
parent573a4c9cd59d7a14e4ab305284a287c705d6b945 (diff)
downloadwireshark-e77817cc92e368f13ac0cbee456fadb326d3a571.tar.gz
wireshark-e77817cc92e368f13ac0cbee456fadb326d3a571.tar.bz2
wireshark-e77817cc92e368f13ac0cbee456fadb326d3a571.zip
Revert "Temporary hack to try to debug tshark -G values crash on 32-bit Windows."
This reverts commit 573a4c9cd59d7a14e4ab305284a287c705d6b945. Change-Id: Ia967e1e7ae617556cb2d0247fa45026f610bafa8 Reviewed-on: https://code.wireshark.org/review/22198 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--epan/proto.c2
-rwxr-xr-xtest/suite-clopts.sh1
2 files changed, 0 insertions, 3 deletions
diff --git a/epan/proto.c b/epan/proto.c
index 7e2d0433d8..0c262b79c6 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -9239,8 +9239,6 @@ proto_registrar_dump_values(void)
continue;
}
-fprintf(stderr, "Dumping %s value string, if any\n", hfinfo->abbrev);
-
/* ignore protocols */
if (proto_registrar_is_protocol(i)) {
continue;
diff --git a/test/suite-clopts.sh b/test/suite-clopts.sh
index f988aec426..3a0b7eda68 100755
--- a/test/suite-clopts.sh
+++ b/test/suite-clopts.sh
@@ -296,7 +296,6 @@ test_dump_glossary() {
RETURNVALUE=$?
if [ ! $RETURNVALUE -eq $EXIT_OK ]; then
test_step_failed "exit status: $RETURNVALUE"
- test_step_failed "Error messages on stderr"
elif [ -s ./testout.txt ]; then
test_step_output_print ./testout.txt
test_step_failed "Error messages on stderr"