From 2245d9a2d79f36f41938524d6f870eaf66447770 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Thu, 31 Dec 2015 22:04:54 -0500
Subject: argv.h: rename ARGV_TAB to (the clearer) ARGV_TAB_WIDTH.
---
src/internal/argv/argv.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/internal/argv/argv.h b/src/internal/argv/argv.h
index 97a312e..9642fab 100644
--- a/src/internal/argv/argv.h
+++ b/src/internal/argv/argv.h
@@ -21,8 +21,8 @@
#define ARGV_VERBOSITY_STATUS 0x02
#define ARGV_CLONE_VECTOR 0x80
-#ifndef ARGV_TAB
-#define ARGV_TAB 8
+#ifndef ARGV_TAB_WIDTH
+#define ARGV_TAB_WIDTH 8
#endif
enum argv_optarg {
@@ -669,8 +669,8 @@ static void argv_usage(
}
}
- optlen += ARGV_TAB;
- optlen &= (~(ARGV_TAB-1));
+ optlen += ARGV_TAB_WIDTH;
+ optlen &= (~(ARGV_TAB_WIDTH-1));
paradigm = next_para = buf = 0;
fnewline = false;
@@ -678,8 +678,8 @@ static void argv_usage(
mparalen = 0;
if (paralen) {
- paralen += (ARGV_TAB);
- paralen &= (~(ARGV_TAB-1));
+ paralen += (ARGV_TAB_WIDTH);
+ paralen &= (~(ARGV_TAB_WIDTH-1));
mparalen = paralen + 2*rbblen;
if (optlen + paralen > 64)
@@ -687,10 +687,10 @@ static void argv_usage(
}
/* account for ' ','\t', try to fit in 80 or 96 columns */
- if (optlen+paralen+2+ARGV_TAB < 80-32)
- desclen = 80 - (optlen+paralen+2+ARGV_TAB);
- else if (optlen+paralen+2+ARGV_TAB < 96-32)
- desclen = 96 - (optlen+paralen+2+ARGV_TAB);
+ if (optlen+paralen+2+ARGV_TAB_WIDTH < 80-32)
+ desclen = 80 - (optlen+paralen+2+ARGV_TAB_WIDTH);
+ else if (optlen+paralen+2+ARGV_TAB_WIDTH < 96-32)
+ desclen = 96 - (optlen+paralen+2+ARGV_TAB_WIDTH);
else
desclen = 32;
--
cgit v1.2.3