Magic number elimination.

diff --git a/hexdump.c b/hexdump.c
index 4732ef93163561fb3d8b973cc5aac1bbcd97d554..3dfe3ba2f012e72e10d6ec1943c88c099a802d82 100644 (file)
--- a/hexdump.c
+++ b/hexdump.c
@@ -11,8 +11,10 @@ hexdump.c -- generate CP/M style hex dumps
 #include <stdlib.h>
 #include <stdbool.h>
 
-#define DEFWIDTH 16            /* Default # chars to show per line */
-#define MAXWIDTH 128           /* Maximum # of bytes per line  */
+#define DEFWIDTH       16              /* Default # chars to show per line */
+#define MAXWIDTH       128             /* Maximum # of bytes per line  */
+#define HEXPERBYTE     3               /* Two hex characters plus space */
+#define HEXOVERHEAD    7               /* fixed overhead per line of hex */
 
 static long    linebytes = DEFWIDTH;   /* # of bytes to print per line */
 static bool    eflag = false;          /* display ebcdic if true */
@@ -109,7 +111,7 @@ static void dumpfile(FILE *f)
 
            /* update counters and things */
            ai++;
-           hpos += 3;
+           hpos += HEXPERBYTE;
        }
 
        /* At end-of-line or EOF, show ASCII or EBCDIC version of data. */
@@ -117,7 +119,7 @@ static void dumpfile(FILE *f)
        {
            if (!cflag)
            {
-               while (hpos < linebytes * 3 + 7)
+               while (hpos < linebytes * HEXPERBYTE + HEXOVERHEAD)
                {
                    hpos++;
                    (void) putchar(' ');