From 714c2fbf959253f4b03106e39d9a2ec140db8ceb Mon Sep 17 00:00:00 2001
From: Stefan Rueger <stefan.rueger@urclocks.com>
Date: Wed, 12 Oct 2022 15:55:22 +0100
Subject: [PATCH] Rename variable for clarity in avrcache.c

---
 src/avrcache.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/avrcache.c b/src/avrcache.c
index aa919584..23563036 100644
--- a/src/avrcache.c
+++ b/src/avrcache.c
@@ -137,21 +137,21 @@ int avr_read_page_default(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM
   if(!avr_has_paged_access(pgm, mem) || addr < 0 || addr >= mem->size)
     return LIBAVRDUDE_GENERAL_FAILURE;
 
-  int rc, pgsize = mem->page_size, off = addr & ~(pgsize-1);
+  int rc, pgsize = mem->page_size, base = addr & ~(pgsize-1);
   unsigned char *pagecopy = cfg_malloc("avr_read_page_default()", pgsize);
 
   if(pgsize == 1)
     return pgm->read_byte(pgm, p, mem, addr, buf);
 
-  memcpy(pagecopy, mem->buf + off, pgsize);
-  if((rc = pgm->paged_load(pgm, p, mem, pgsize, off, pgsize)) >= 0)
-    memcpy(buf, mem->buf + off, pgsize);
-  memcpy(mem->buf + off, pagecopy, pgsize);
+  memcpy(pagecopy, mem->buf + base, pgsize);
+  if((rc = pgm->paged_load(pgm, p, mem, pgsize, base, pgsize)) >= 0)
+    memcpy(buf, mem->buf + base, pgsize);
+  memcpy(mem->buf + base, pagecopy, pgsize);
 
   if(rc < 0) {
     rc = LIBAVRDUDE_SUCCESS;
     for(int i=0; i<pgsize; i++) {
-      if(pgm->read_byte(pgm, p, mem, off+i, pagecopy+i) < 0) {
+      if(pgm->read_byte(pgm, p, mem, base+i, pagecopy+i) < 0) {
         rc = LIBAVRDUDE_GENERAL_FAILURE;
         break;
       }
@@ -175,16 +175,16 @@ int avr_write_page_default(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM
   if(!avr_has_paged_access(pgm, mem) || addr < 0 || addr >= mem->size)
     return LIBAVRDUDE_GENERAL_FAILURE;
 
-  int rc, pgsize = mem->page_size, off = addr & ~(pgsize-1);
+  int rc, pgsize = mem->page_size, base = addr & ~(pgsize-1);
   unsigned char *pagecopy = cfg_malloc("avr_write_page_default()", pgsize);
 
   if(pgsize == 1)
     return pgm->write_byte(pgm, p, mem, addr, *data);
 
-  memcpy(pagecopy, mem->buf + off, pgsize);
-  memcpy(mem->buf + off, data, pgsize);
-  rc = pgm->paged_write(pgm, p, mem, pgsize, off, pgsize);
-  memcpy(mem->buf + off, pagecopy, pgsize);
+  memcpy(pagecopy, mem->buf + base, pgsize);
+  memcpy(mem->buf + base, data, pgsize);
+  rc = pgm->paged_write(pgm, p, mem, pgsize, base, pgsize);
+  memcpy(mem->buf + base, pagecopy, pgsize);
   free(pagecopy);
 
   return rc;