From 97146be88306270a05747bc2903eac678fb1ae2e Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 2 Dec 2015 10:05:53 +0100 Subject: [PATCH] The variable is assigned values twice successively found by PVS Studio (V519) Change-Id: I063b0ee2dd4ed948f889c33ab458df20079a64ff Reviewed-on: https://code.wireshark.org/review/12370 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-cpfi.c | 2 +- epan/dissectors/packet-megaco.c | 2 +- ui/win32/print_win32.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c index ce9d1aeeb7..4fa98a11ca 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.c @@ -359,7 +359,7 @@ dissect_cpfi(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree, void * /* Set up the frame controls - can we do better than this? */ fc_data.sof_eof = 0; - fc_data.sof_eof = FC_DATA_SOF_FIRST_FRAME; + fc_data.sof_eof |= FC_DATA_SOF_FIRST_FRAME; fc_data.sof_eof |= FC_DATA_EOF_LAST_FRAME; fc_data.sof_eof |= FC_DATA_EOF_INVALID; diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index 3954417b13..3c14dfdf0f 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -2156,7 +2156,7 @@ dissect_megaco_signaldescriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *m } - tvb_help_offset = tvb_LBRKT = tvb_find_guint8(tvb, tvb_previous_offset, tvb_signals_end_offset, '{'); + tvb_help_offset = tvb_find_guint8(tvb, tvb_previous_offset, tvb_signals_end_offset, '{'); /* if there are signalparameter */ diff --git a/ui/win32/print_win32.c b/ui/win32/print_win32.c index cfa211cb8e..7ccb36c465 100644 --- a/ui/win32/print_win32.c +++ b/ui/win32/print_win32.c @@ -209,7 +209,7 @@ static void print_file(const char *file_name, HDC hdc, int width, int height) /* send buffer */ buf[cnt] = 0; TextOut(hdc, X_OFFSET,y_pos, buf, (int) strlen(buf)); - y_pos += tm.tmHeight; + /*y_pos += tm.tmHeight;*/ cnt = 0; /* reset page */