diff options
| author | Kjell Wooding <kjell@cvs.openbsd.org> | 2005-12-13 06:01:28 +0000 |
|---|---|---|
| committer | Kjell Wooding <kjell@cvs.openbsd.org> | 2005-12-13 06:01:28 +0000 |
| commit | 0cbc971335254de4fe1790983eca3b99bc50012a (patch) | |
| tree | c5e1196f45ed833bd5dacb99cce1b9a379847d0c /usr.bin/mg/echo.c | |
| parent | 28a23b22ee1dba99041e501bb64afdc747e6670f (diff) | |
More name-clash delinting
Diffstat (limited to 'usr.bin/mg/echo.c')
| -rw-r--r-- | usr.bin/mg/echo.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/mg/echo.c b/usr.bin/mg/echo.c index 100eab9034e..f10ae02cebb 100644 --- a/usr.bin/mg/echo.c +++ b/usr.bin/mg/echo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: echo.c,v 1.41 2005/11/19 20:16:35 kjell Exp $ */ +/* $OpenBSD: echo.c,v 1.42 2005/12/13 06:01:27 kjell Exp $ */ /* This file is in the public domain. */ @@ -461,7 +461,6 @@ veread(const char *fp, char *buf, size_t nbuf, int flag, va_list ap) ttflush(); } } - ret = buf; done: if (cwin == TRUE) { /* blow away cpltion window */ @@ -802,7 +801,7 @@ eformat(const char *fp, va_list ap) c = *fp++; switch (c) { case 'c': - keyname(kname, sizeof(kname), va_arg(ap, int)); + getkeyname(kname, sizeof(kname), va_arg(ap, int)); eputs(kname); break; @@ -810,7 +809,7 @@ eformat(const char *fp, va_list ap) for (cp = kname, c = 0; c < key.k_count; c++) { if (c) *cp++ = ' '; - cp = keyname(cp, sizeof(kname) - + cp = getkeyname(cp, sizeof(kname) - (cp - kname) - 1, key.k_chars[c]); } eputs(kname); |