From 07fe9d554f96391f83bd136d243e060ccdcd1887 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Tue, 29 Oct 2024 11:51:34 -0500
Subject: [PATCH] Minor cleanups.

---
 toys/other/devmem.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/toys/other/devmem.c b/toys/other/devmem.c
index e3727fd5..90c25060 100644
--- a/toys/other/devmem.c
+++ b/toys/other/devmem.c
@@ -42,42 +42,40 @@ unsigned long xatolu(char *str, int bytes)
 
 void devmem_main(void)
 {
-  int writing = toys.optc > 2, page_size = sysconf(_SC_PAGESIZE), bytes = 4, fd,
-    flags;
-  unsigned long data = 0, map_off, map_len,
+  int ii, writing = toys.optc > 2, bytes = 4, fd;
+  unsigned long data QUIET, map_len QUIET,
     addr = xatolu(*toys.optargs, sizeof(long));
-  char *sizes = sizeof(long)==8 ? "1248" : "124";
-  void *map, *p;
+  void *map QUIET, *p QUIET;
 
   // WIDTH?
   if (toys.optc>1) {
-    int i;
+    char *sizes = sizeof(long)==8 ? "1248" : "124";
 
-    if ((i=stridx(sizes, *toys.optargs[1]))==-1 || toys.optargs[1][1])
+    if ((ii = stridx(sizes, *toys.optargs[1]))==-1 || toys.optargs[1][1])
       error_exit("bad width: %s", toys.optargs[1]);
-    bytes = 1<<i;
+    bytes = 1<<ii;
   }
 
   // Map in just enough.
   if (CFG_TOYBOX_FORK) {
-    flags = writing ? O_RDWR : O_RDONLY;
-    if (!FLAG(no_sync)) flags |= O_SYNC;
-    fd = xopen(TT.f ?: "/dev/mem", flags);
+    fd = xopen(TT.f ? : "/dev/mem", O_RDWR*writing+O_SYNC*!FLAG(no_sync));
     if (FLAG(no_mmap)) xlseek(fd, addr, SEEK_SET);
     else {
-      map_off = addr & ~(page_size - 1ULL);
+      unsigned long long page_size = sysconf(_SC_PAGESIZE)-1, map_off;
+
+      map_off = addr & ~page_size;
       map_len = addr + (writing ? (toys.optc - 2) * bytes : bytes) - map_off;
       map = xmmap(0, map_len, writing ? PROT_WRITE : PROT_READ, MAP_SHARED, fd,
           map_off);
-      p = map + (addr & (page_size - 1));
+      p = map+(addr&page_size);
       close(fd);
     }
   } else p = (void *)addr;
 
   // Not using peek()/poke() because registers care about size of read/write.
   if (writing) {
-    for (int i = 2; i < toys.optc; i++) {
-      data = xatolu(toys.optargs[i], bytes);
+    for (ii = 2; ii<toys.optc; ii++) {
+      data = xatolu(toys.optargs[ii], bytes);
       if (FLAG(no_mmap)) xwrite(fd, &data, bytes);
       else {
         if (bytes==1) *(char *)p = data;
-- 
2.39.5