builtin/apply: avoid parameter shadowing 'linenr' global
commiteb8fdbff3c26639912e73a01cfa2a86ce787d4b2
authorChristian Couder <christian.couder@gmail.com>
Wed, 11 May 2016 13:16:14 +0000 (11 15:16 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 12 May 2016 19:09:43 +0000 (12 12:09 -0700)
treedab3e780748bf2e14ed137be63573725ea786604
parent560e35468feea3b471418dfe48d753f433141e10
builtin/apply: avoid parameter shadowing 'linenr' global

Let's just rename the global 'state_linenr' as it will become
'state->linenr' in a following patch.

This also avoid errors when compiling with -Wshadow and makes
it safer to later move global variables into a "state" struct.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/apply.c