summaryrefslogtreecommitdiffstats
path: root/source3/utils/regedit_hexedit.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-11-13 09:12:56 +0100
committerJeremy Allison <jra@samba.org>2014-11-25 07:25:45 +0100
commit5d070d9f1844ebb120cf254c57f45c3aba9618ef (patch)
treed6ddc72fa291baa4bf37fc640ca4f37af0e26fef /source3/utils/regedit_hexedit.c
parent002a1c57a962779372643abf0857e820541c1b0d (diff)
downloadsamba-5d070d9f1844ebb120cf254c57f45c3aba9618ef.tar.gz
samba-5d070d9f1844ebb120cf254c57f45c3aba9618ef.tar.xz
samba-5d070d9f1844ebb120cf254c57f45c3aba9618ef.zip
s3:utils: rename variables in regedit_*.c to fix shadow warnings
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/utils/regedit_hexedit.c')
-rw-r--r--source3/utils/regedit_hexedit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/utils/regedit_hexedit.c b/source3/utils/regedit_hexedit.c
index 377eef97ad..d70c521fa6 100644
--- a/source3/utils/regedit_hexedit.c
+++ b/source3/utils/regedit_hexedit.c
@@ -459,7 +459,7 @@ static void erase_at(struct hexedit *buf, size_t pos)
static void do_backspace(struct hexedit *buf)
{
size_t off;
- bool erase = true;
+ bool do_erase = true;
if (buf->cursor_offset == 0) {
return;
@@ -479,11 +479,11 @@ static void do_backspace(struct hexedit *buf)
calc_cursor_offset(buf);
} else {
if (buf->cursor_x < ASCII_COL && buf->nibble) {
- erase = false;
+ do_erase = false;
}
cursor_left(buf);
}
- if (erase) {
+ if (do_erase) {
erase_at(buf, off - 1);
}
}