diff options
| author | Gerald Combs <gerald@wireshark.org> | 2020-07-06 10:04:44 -0700 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2020-07-06 18:42:07 +0000 |
| commit | 30f8f9656bb7c1f550e9f0efe9dd2f81d850f16e (patch) | |
| tree | f99305cf9d9883c3425c98a99eff9433c1142911 /epan/proto.c | |
| parent | 4b4bbe8067aa2a33d3bc6505f07fa0ef907d2f92 (diff) | |
epan: Fixup our ENABLE_CHECK_FILTER warnings.
Make sure we use g_warning to print each ENABLE_CHECK_FILTER warning.
g_warning automatically appends a newline, so there's no need for us to
do so.
Change-Id: I4ddb60f0e3e0382fb3ca6e996ad47410fe05d8be
Reviewed-on: https://code.wireshark.org/review/37748
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/proto.c b/epan/proto.c index c83975d564..065b4b2c34 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -189,7 +189,7 @@ struct ptvcursor { if ((start_values[m].value == current->value) && \ (strcmp(start_values[m].strptr, current->strptr) != 0)) { \ g_warning("Field '%s' (%s) has a conflicting entry in its" \ - " value_string: %" modifier "u is at indices %u (%s) and %u (%s)\n", \ + " value_string: %" modifier "u is at indices %u (%s) and %u (%s)", \ hfinfo->name, hfinfo->abbrev, \ current->value, m, start_values[m].strptr, n, current->strptr); \ } \ @@ -8056,7 +8056,7 @@ tmp_fld_check_assert(header_field_info *hfinfo) const true_false_string *tfs = (const true_false_string*)hfinfo->strings; if (tfs) { if (strcmp(tfs->false_string, tfs->true_string) == 0) { - g_warning("Field '%s' (%s) has identical true and false strings (\"%s\", \"%s\")\n", + g_warning("Field '%s' (%s) has identical true and false strings (\"%s\", \"%s\")", hfinfo->name, hfinfo->abbrev, tfs->false_string, tfs->true_string); } @@ -8070,7 +8070,7 @@ tmp_fld_check_assert(header_field_info *hfinfo) do { if (this_it->value_max < this_it->value_min) { - g_warning("value_range_string error: %s (%s) entry for \"%s\" - max(%u 0x%x) is less than min(%u 0x%x)\n", + g_warning("value_range_string error: %s (%s) entry for \"%s\" - max(%u 0x%x) is less than min(%u 0x%x)", hfinfo->name, hfinfo->abbrev, this_it->strptr, this_it->value_max, this_it->value_max, @@ -8083,7 +8083,7 @@ tmp_fld_check_assert(header_field_info *hfinfo) /* Not OK if this one is completely hidden by an earlier one! */ if ((prev_it->value_min <= this_it->value_min) && (prev_it->value_max >= this_it->value_max)) { g_warning("value_range_string error: %s (%s) hidden by earlier entry " - "(prev=\"%s\": %u 0x%x -> %u 0x%x) (this=\"%s\": %u 0x%x -> %u 0x%x)\n", + "(prev=\"%s\": %u 0x%x -> %u 0x%x) (this=\"%s\": %u 0x%x -> %u 0x%x)", hfinfo->name, hfinfo->abbrev, prev_it->strptr, prev_it->value_min, prev_it->value_min, prev_it->value_max, prev_it->value_max, @@ -8606,7 +8606,7 @@ proto_register_field_init(header_field_info *hfinfo, const int parent) #ifdef ENABLE_CHECK_FILTER while (same_name_hfinfo) { if (_ftype_common(hfinfo->type) != _ftype_common(same_name_hfinfo->type)) - fprintf(stderr, "'%s' exists multiple times with NOT compatible types: %s and %s\n", hfinfo->abbrev, ftype_name(hfinfo->type), ftype_name(same_name_hfinfo->type)); + g_warning("'%s' exists multiple times with incompatible types: %s and %s", hfinfo->abbrev, ftype_name(hfinfo->type), ftype_name(same_name_hfinfo->type)); same_name_hfinfo = same_name_hfinfo->same_name_next; } #endif |