about summary refs log tree commit diff
path: root/Src/utils.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@users.sourceforge.net>2006-01-13 17:13:49 +0000
committerWayne Davison <wayned@users.sourceforge.net>2006-01-13 17:13:49 +0000
commit78ddb65f6c7ac4bd580be5a7987bf31f697558df (patch)
treec7a0958d5e0b6a72cb4bcf0053a443ecb05a4f16 /Src/utils.c
parentfb658381f9b9d9619c0eea3040bc51916fcc4213 (diff)
downloadzsh-78ddb65f6c7ac4bd580be5a7987bf31f697558df.tar.gz
zsh-78ddb65f6c7ac4bd580be5a7987bf31f697558df.tar.xz
zsh-78ddb65f6c7ac4bd580be5a7987bf31f697558df.zip
Got rid of some superfluous STOUC() calls (such as the ones I added
for the arg of calls to nicechar(), which doesn't need this).
Diffstat (limited to 'Src/utils.c')
-rw-r--r--Src/utils.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/Src/utils.c b/Src/utils.c
index bb993e74d..5a1c5ab30 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -400,7 +400,7 @@ void
 nicefputs(char *s, FILE *f)
 {
     for (; *s; s++)
-	zputs(nicechar(STOUC(*s)), f);
+	zputs(nicechar(*s), f);
 }
 #endif
 
@@ -1667,7 +1667,7 @@ read_poll(int fd, int *readchar, int polltty, zlong microseconds)
 	 * Praise Bill, this works under Cygwin (nothing else seems to).
 	 */
 	if ((polltty || setblock_fd(0, fd, &mode)) && read(fd, &c, 1) > 0) {
-	    *readchar = STOUC(c);
+	    *readchar = c;
 	    ret = 1;
 	}
 	if (mode != -1)
@@ -1963,7 +1963,6 @@ spckword(char **s, int hist, int cmd, int ask)
  * NUL and return 1 if that doesn't fit.
  */
 
-/**/
 static int
 ztrftimebuf(int *bufsizeptr, int decr)
 {
@@ -3420,7 +3419,7 @@ niceztrlen(char const *s)
 	}
 	if (c == Meta)
 	    c = *s++ ^ 32;
-	l += strlen(nicechar(STOUC(c)));
+	l += strlen(nicechar(c));
     }
     return l;
 }
@@ -3479,7 +3478,7 @@ mb_niceformat(const char *s, FILE *stream, char **outstrp, int heap)
 	    /* FALL THROUGH */
 	case MB_INVALID:
 	    /* The byte didn't convert, so output it as a \M-... sequence. */
-	    fmt = nicechar(STOUC(*ptr));
+	    fmt = nicechar(*ptr);
 	    newl = strlen(fmt);
 	    cnt = 1;
 	    /* Get mbs out of its undefined state. */