From db444d2063df6c574882d9263e885c4fe1134133 Mon Sep 17 00:00:00 2001 From: weili Date: Thu, 2 Jun 2016 15:48:15 -0700 Subject: Fix all the code which has duplicate variable declarations When there are duplicate variable declarations, the inner names shadow the outter ones. This is error prone and harder to read. Remove all the instances found by /analyze. BUG=chromium:613623, chromium:427616 Review-Url: https://codereview.chromium.org/2027273002 --- core/fxcodec/codec/fx_codec_fax.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/fxcodec') diff --git a/core/fxcodec/codec/fx_codec_fax.cpp b/core/fxcodec/codec/fx_codec_fax.cpp index 97b7ee2ad6..59010391c5 100644 --- a/core/fxcodec/codec/fx_codec_fax.cpp +++ b/core/fxcodec/codec/fx_codec_fax.cpp @@ -359,16 +359,16 @@ FX_BOOL FaxG4GetRow(const uint8_t* src_buf, if (bitpos >= bitsize) { return FALSE; } - FX_BOOL bit1 = NEXTBIT; + FX_BOOL next_bit1 = NEXTBIT; if (bitpos >= bitsize) { return FALSE; } - FX_BOOL bit2 = NEXTBIT; - if (bit1 && bit2) { + FX_BOOL next_bit2 = NEXTBIT; + if (next_bit1 && next_bit2) { v_delta = 2; - } else if (bit1) { + } else if (next_bit1) { v_delta = -2; - } else if (bit2) { + } else if (next_bit2) { if (bitpos >= bitsize) { return FALSE; } -- cgit v1.2.3