Fix more code which has shadow variables

Fix more code which has shadow variables

The code has local variables that shadow struct or class member
variables. Also, when this happens, different variable names should be
used instead of namespaces.
These were discovered by /Wshadow warning flag in Clang.

Committed: https://pdfium.googlesource.com/pdfium/+/98963398054a20287cf6b354932ef56ddb4da48c

[Wei Li, 2016-06-04 00:19:11]

Description was changed from

==========
Fix code which has shadow variables

The code has local variables that shadow struct or class member
variables. Also, when this happens, different variable names should be
used instead of namespaces.
These were discovered by /Wshadow warning flag in Clang.
==========

to

==========
Fix code which has shadow variables

The code has local variables that shadow struct or class member
variables. Also, when this happens, different variable names should be
used instead of namespaces.
These were discovered by /Wshadow warning flag in Clang.
==========

[Wei Li, 2016-06-04 00:43:55]

Patchset #1 (id:1) has been deleted

[Wei Li, 2016-06-04 00:45:22]

Description was changed from

==========
Fix code which has shadow variables

The code has local variables that shadow struct or class member
variables. Also, when this happens, different variable names should be
used instead of namespaces.
These were discovered by /Wshadow warning flag in Clang.
==========

to

==========
Fix more code which has shadow variables

The code has local variables that shadow struct or class member
variables. Also, when this happens, different variable names should be
used instead of namespaces.
These were discovered by /Wshadow warning flag in Clang.
==========

[Wei Li, 2016-06-04 00:48:20]

weili@chromium.org changed reviewers:
+ dsinclair@chromium.org, tsepez@chromium.org

[Wei Li, 2016-06-04 00:48:20]

for review, thanks

[dsinclair, 2016-06-06 12:50:11]

lgtm w/ nits.

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
File core/fxcodec/jbig2/JBig2_GrdProc.cpp (right):

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrdProc.cpp:21: m_LTP(0) {
nit: FALSE

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrdProc.cpp:609: m_LTP = 0;
nit: FALSE

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrdProc.cpp:719: if (m_LTP == 1) {
nit: TRUE  (and others below)

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
File core/fxcodec/jbig2/JBig2_GrrdProc.cpp (right):

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrrdProc.cpp:162: int32_t iGRW, iGRH;
nit: one per line

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrrdProc.cpp:400: int32_t iGRW, iGRH;
ditto

https://codereview.chromium.org/2034253003/diff/20001/fpdfsdk/fsdk_baseannot.cpp
File fpdfsdk/fsdk_baseannot.cpp (right):

https://codereview.chromium.org/2034253003/diff/20001/fpdfsdk/fsdk_baseannot....
fpdfsdk/fsdk_baseannot.cpp:379: time_t t = (time_t)(*this);
nit: static_cast?

[Tom Sepez, 2016-06-06 16:43:34]

lgtm

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/codec/code...
File core/fxcodec/codec/codec_int.h (right):

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/codec/code...
core/fxcodec/codec/codec_int.h:27: unsigned char* src_data;
nit: these should probably be uint8_t* rather than unsigned char*.

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
File core/fxcodec/jbig2/JBig2_GrdProc.cpp (right):

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrdProc.cpp:719: if (m_LTP == 1) {
On 2016/06/06 12:50:10, dsinclair wrote:
> nit: TRUE  (and others below)

just if (m_LTP) {

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
File core/fxcodec/jbig2/JBig2_GrrdProc.cpp (right):

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrrdProc.cpp:399: int32_t GRWR, GRHR;
nit: move to line 412 while at it.

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrrdProc.cpp:400: int32_t iGRW, iGRH;
On 2016/06/06 12:50:11, dsinclair wrote:
> ditto

Also combine definition and initialization onto one line.

https://codereview.chromium.org/2034253003/diff/20001/fpdfsdk/fsdk_baseannot.cpp
File fpdfsdk/fsdk_baseannot.cpp (right):

https://codereview.chromium.org/2034253003/diff/20001/fpdfsdk/fsdk_baseannot....
fpdfsdk/fsdk_baseannot.cpp:379: time_t t = (time_t)(*this);
On 2016/06/06 12:50:11, dsinclair wrote:
> nit: static_cast?

Bleh.  This is wack.  Let's kill CPDFSDK_DateTime::operator(time_t) and add a
ToTime_t() method.  Maybe as a follow-up if you don't want to mix it up now.

https://codereview.chromium.org/2034253003/diff/20001/fpdfsdk/javascript/JS_G...
File fpdfsdk/javascript/JS_GlobalData.h (right):

https://codereview.chromium.org/2034253003/diff/20001/fpdfsdk/javascript/JS_G...
fpdfsdk/javascript/JS_GlobalData.h:37: CFX_ArrayTemplate<CJS_KeyValue*> m_array;
nit: m_Array seems to be the convention.

[Wei Li, 2016-06-07 17:05:13]

Patchset #3 (id:60001) has been deleted

[Wei Li, 2016-06-07 17:33:53]

Thanks for the review, did an overhaul on style fixes.

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/codec/code...
File core/fxcodec/codec/codec_int.h (right):

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/codec/code...
core/fxcodec/codec/codec_int.h:27: unsigned char* src_data;
On 2016/06/06 16:43:33, Tom Sepez wrote:
> nit: these should probably be uint8_t* rather than unsigned char*.

Done.

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
File core/fxcodec/jbig2/JBig2_GrdProc.cpp (right):

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrdProc.cpp:21: m_LTP(0) {
On 2016/06/06 12:50:11, dsinclair wrote:
> nit: FALSE

Done.

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrdProc.cpp:609: m_LTP = 0;
On 2016/06/06 12:50:10, dsinclair wrote:
> nit: FALSE

Done.

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrdProc.cpp:719: if (m_LTP == 1) {
On 2016/06/06 16:43:33, Tom Sepez wrote:
> On 2016/06/06 12:50:10, dsinclair wrote:
> > nit: TRUE  (and others below)
> 
> just if (m_LTP) {

Done.

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
File core/fxcodec/jbig2/JBig2_GrrdProc.cpp (right):

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrrdProc.cpp:162: int32_t iGRW, iGRH;
On 2016/06/06 12:50:11, dsinclair wrote:
> nit: one per line

Done.

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrrdProc.cpp:399: int32_t GRWR, GRHR;
On 2016/06/06 16:43:33, Tom Sepez wrote:
> nit: move to line 412 while at it.

Done.

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrrdProc.cpp:400: int32_t iGRW, iGRH;
On 2016/06/06 12:50:11, dsinclair wrote:
> ditto

Done.

https://codereview.chromium.org/2034253003/diff/20001/core/fxcodec/jbig2/JBig...
core/fxcodec/jbig2/JBig2_GrrdProc.cpp:400: int32_t iGRW, iGRH;
On 2016/06/06 16:43:33, Tom Sepez wrote:
> On 2016/06/06 12:50:11, dsinclair wrote:
> > ditto
> 
> Also combine definition and initialization onto one line.

Done.

https://codereview.chromium.org/2034253003/diff/20001/fpdfsdk/fsdk_baseannot.cpp
File fpdfsdk/fsdk_baseannot.cpp (right):

https://codereview.chromium.org/2034253003/diff/20001/fpdfsdk/fsdk_baseannot....
fpdfsdk/fsdk_baseannot.cpp:379: time_t t = (time_t)(*this);
On 2016/06/06 16:43:34, Tom Sepez wrote:
> On 2016/06/06 12:50:11, dsinclair wrote:
> > nit: static_cast?
> 
> Bleh.  This is wack.  Let's kill CPDFSDK_DateTime::operator(time_t) and add a
> ToTime_t() method.  Maybe as a follow-up if you don't want to mix it up now.

Yes, I will do this in a follow-up.

https://codereview.chromium.org/2034253003/diff/20001/fpdfsdk/javascript/JS_G...
File fpdfsdk/javascript/JS_GlobalData.h (right):

https://codereview.chromium.org/2034253003/diff/20001/fpdfsdk/javascript/JS_G...
fpdfsdk/javascript/JS_GlobalData.h:37: CFX_ArrayTemplate<CJS_KeyValue*> m_array;
On 2016/06/06 16:43:34, Tom Sepez wrote:
> nit: m_Array seems to be the convention.

Done.

[Wei Li, 2016-06-07 18:28:10]

The CQ bit was checked by weili@chromium.org

[Wei Li, 2016-06-07 18:28:11]

The patchset sent to the CQ was uploaded after l-g-t-m from tsepez@chromium.org,
dsinclair@chromium.org
Link to the patchset: https://codereview.chromium.org/2034253003/#ps40001
(title: "address comments and style fix")

[commit-bot: I haz the power, 2016-06-07 18:28:15]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2034253003/40001

[commit-bot: I haz the power, 2016-06-07 18:28:34]

Description was changed from

==========
Fix more code which has shadow variables

The code has local variables that shadow struct or class member
variables. Also, when this happens, different variable names should be
used instead of namespaces.
These were discovered by /Wshadow warning flag in Clang.
==========

to

==========
Fix more code which has shadow variables

The code has local variables that shadow struct or class member
variables. Also, when this happens, different variable names should be
used instead of namespaces.
These were discovered by /Wshadow warning flag in Clang.

Committed:
https://pdfium.googlesource.com/pdfium/+/98963398054a20287cf6b354932ef56ddb4d...
==========

[commit-bot: I haz the power, 2016-06-07 18:28:35]

Committed patchset #2 (id:40001) as
https://pdfium.googlesource.com/pdfium/+/98963398054a20287cf6b354932ef56ddb4d...