diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 05:51:47 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 05:51:47 +0000 |
commit | f05428e4cd63dde97bac14b84dd146a5c00455e3 (patch) | |
tree | e1331adb5d216f2b3fa6baa6491752348d2e5f10 /lib/libmytinfo | |
parent | 6de57e42c294763c78d77b0a9a7c5a08008a378a (diff) | |
download | FreeBSD-src-f05428e4cd63dde97bac14b84dd146a5c00455e3.zip FreeBSD-src-f05428e4cd63dde97bac14b84dd146a5c00455e3.tar.gz |
Remove trailing whitespace.
Diffstat (limited to 'lib/libmytinfo')
-rw-r--r-- | lib/libmytinfo/TESTS/caps.c | 2 | ||||
-rw-r--r-- | lib/libmytinfo/TESTS/clear.c | 4 | ||||
-rw-r--r-- | lib/libmytinfo/TESTS/tput.c | 2 | ||||
-rw-r--r-- | lib/libmytinfo/TESTS/tset.c | 12 | ||||
-rw-r--r-- | lib/libmytinfo/TESTS/ttest.c | 16 | ||||
-rw-r--r-- | lib/libmytinfo/addstr.c | 6 | ||||
-rw-r--r-- | lib/libmytinfo/bsearch.c | 2 | ||||
-rw-r--r-- | lib/libmytinfo/buildpath.c | 16 | ||||
-rw-r--r-- | lib/libmytinfo/config.h | 4 | ||||
-rw-r--r-- | lib/libmytinfo/fillterm.c | 4 | ||||
-rw-r--r-- | lib/libmytinfo/findterm.c | 2 | ||||
-rw-r--r-- | lib/libmytinfo/gettbin.c | 8 | ||||
-rw-r--r-- | lib/libmytinfo/gettcap.c | 10 | ||||
-rw-r--r-- | lib/libmytinfo/gettinfo.c | 8 | ||||
-rw-r--r-- | lib/libmytinfo/mkcapsort.c | 6 | ||||
-rw-r--r-- | lib/libmytinfo/mktermhead.c | 2 | ||||
-rw-r--r-- | lib/libmytinfo/mkversion.c | 2 | ||||
-rw-r--r-- | lib/libmytinfo/readcaps.c | 4 | ||||
-rw-r--r-- | lib/libmytinfo/tcapconv.c | 6 | ||||
-rw-r--r-- | lib/libmytinfo/term.h | 8 | ||||
-rw-r--r-- | lib/libmytinfo/termcap.c | 10 | ||||
-rw-r--r-- | lib/libmytinfo/terminfo.c | 4 | ||||
-rw-r--r-- | lib/libmytinfo/tgoto.c | 2 | ||||
-rw-r--r-- | lib/libmytinfo/tparm.c | 14 | ||||
-rw-r--r-- | lib/libmytinfo/tputs.c | 6 | ||||
-rw-r--r-- | lib/libmytinfo/tty.c | 6 |
26 files changed, 83 insertions, 83 deletions
diff --git a/lib/libmytinfo/TESTS/caps.c b/lib/libmytinfo/TESTS/caps.c index 9d4f00f..e90d26e 100644 --- a/lib/libmytinfo/TESTS/caps.c +++ b/lib/libmytinfo/TESTS/caps.c @@ -1,6 +1,6 @@ /* * caps.c - * + * * By Ross Ridge * Public Domain * 92/02/01 07:29:45 diff --git a/lib/libmytinfo/TESTS/clear.c b/lib/libmytinfo/TESTS/clear.c index 1a4767a..b603a52 100644 --- a/lib/libmytinfo/TESTS/clear.c +++ b/lib/libmytinfo/TESTS/clear.c @@ -6,7 +6,7 @@ * 92/02/01 07:29:47 * * clear - * + * * clears the terminal's screen * */ @@ -146,7 +146,7 @@ int c; int main() { - setupterm((char *) 0, 1, (int *) 0); + setupterm((char *) 0, 1, (int *) 0); if (clear_screen == (char *) 0) exit(1); tputs(clear_screen, lines > 0 ? lines : 1, putch); diff --git a/lib/libmytinfo/TESTS/tput.c b/lib/libmytinfo/TESTS/tput.c index a3b4a16..9c220b8 100644 --- a/lib/libmytinfo/TESTS/tput.c +++ b/lib/libmytinfo/TESTS/tput.c @@ -1,6 +1,6 @@ /* * tput.c - * + * * By Ross Ridge * Public Domain * 92/02/01 07:30:39 diff --git a/lib/libmytinfo/TESTS/tset.c b/lib/libmytinfo/TESTS/tset.c index f04c321..3d1eb65 100644 --- a/lib/libmytinfo/TESTS/tset.c +++ b/lib/libmytinfo/TESTS/tset.c @@ -1,6 +1,6 @@ /* * tset.c - * + * * By Ross Ridge * Public Domain * 92/02/19 18:53:12 @@ -192,7 +192,7 @@ int ask; { ask = 1; *map++ = '\0'; } - if (*map == '\0') + if (*map == '\0') quit(-1, "bad argument to 'm' switch"); if (type[0] != '\0' && strcmp(type, term) != 0) { @@ -548,7 +548,7 @@ char **argv; { break; } } - + cleanup = clean; path = _buildpath("$MYTERMINFO", 2, @@ -756,7 +756,7 @@ char **argv; { #endif #ifdef USE_SGTTY - + #ifdef USE_NEWBSDTTY if (newbsdtty) { if (ioctl(2, TIOCSETD, NTTYDISC) == -1) { @@ -802,7 +802,7 @@ char **argv; { SETTO(VKILL, tty.sg_kill, "Kill", c); } - + #ifdef USE_INTERRUPT if (interrupt_char != -1) { if (interrupt_char != -2) { @@ -914,6 +914,6 @@ char **argv; { } break; } - + return 0; } diff --git a/lib/libmytinfo/TESTS/ttest.c b/lib/libmytinfo/TESTS/ttest.c index 3839e9f..d6cc36e 100644 --- a/lib/libmytinfo/TESTS/ttest.c +++ b/lib/libmytinfo/TESTS/ttest.c @@ -6,7 +6,7 @@ * 92/02/01 07:30:47 * */ - + #define NOTLIB #include "defs.h" #include <term.h> @@ -18,7 +18,7 @@ cup(x,y) int x, y; { if (columns < 2 || lines < 2) return -1; - if (cursor_address != NULL) + if (cursor_address != NULL) putp(tparm(cursor_address, y, x)); else if (cursor_home != NULL && cursor_down != NULL && cursor_right != NULL) { @@ -68,12 +68,12 @@ clear() { void nl() { - if (newline != NULL) + if (newline != NULL) putp(newline); else if (carriage_return != NULL && cursor_down != NULL) { putp(cursor_down); putp(carriage_return); - } else + } else quit(-1, "can't do a newline"); return; } @@ -176,7 +176,7 @@ char **argv; { #endif #endif def_prog_mode(); - + clear(); printf("columns = %d", columns); nl(); @@ -219,10 +219,10 @@ char **argv; { putchar('\\'); } } else if (carriage_return != NULL) { - for(i = 0; i < columns / 4 + 1; i++) + for(i = 0; i < columns / 4 + 1; i++) putchar('/'); putp(carriage_return); - for(i = 0; i < columns / 4 + 1; i++) + for(i = 0; i < columns / 4 + 1; i++) putchar('\\'); } nl(); @@ -292,6 +292,6 @@ char **argv; { clear(); reset_shell_mode(); - + return (0); } diff --git a/lib/libmytinfo/addstr.c b/lib/libmytinfo/addstr.c index 50fb411..d3d7444 100644 --- a/lib/libmytinfo/addstr.c +++ b/lib/libmytinfo/addstr.c @@ -18,13 +18,13 @@ static char const SCCSid[] = "@(#) mytinfo addstr.c 3.2 92/02/01 public domain, /* * I think this routine could be improved, as it is now it searches a * linked list of strbufs for one that has enough room left for the - * string. The only thing else I can think of doing would be to + * string. The only thing else I can think of doing would be to * expand a buffer by realloc and then fix the string pointers if it * moves. */ static struct strbuf *strbuf = NULL; - + struct strbuf * _endstr() { register struct strbuf *p; @@ -81,7 +81,7 @@ TERMINAL *p; { q = p->strbuf; while(q != NULL) { - p->strbuf = q->next; + p->strbuf = q->next; free((anyptr) q); q = p->strbuf; } diff --git a/lib/libmytinfo/bsearch.c b/lib/libmytinfo/bsearch.c index 34fc0fd..aa4eabf 100644 --- a/lib/libmytinfo/bsearch.c +++ b/lib/libmytinfo/bsearch.c @@ -52,7 +52,7 @@ static char const SCCSid[] = "@(#) mytinfo bsearch.c 3.4 92/06/04 public domain, * $OLog: bsearch.c,v $ * Revision 1.1 88/06/11 20:41:48 root * Initial revision - * + * */ #endif diff --git a/lib/libmytinfo/buildpath.c b/lib/libmytinfo/buildpath.c index 5d1c64a..cecba42 100644 --- a/lib/libmytinfo/buildpath.c +++ b/lib/libmytinfo/buildpath.c @@ -1,6 +1,6 @@ /* * buildpath.c - * + * * By Ross Ridge * Public Domain * 92/02/01 07:29:42 @@ -9,7 +9,7 @@ * from its arguments. It returns a pointer to a structure that is used by * other routines as the list of file names to search for terminal * descriptions. It is passed a variable number of arguments consisting - * of file name and type pairs. The file name can actually be a list of + * of file name and type pairs. The file name can actually be a list of * file names seperated by spaces and any environment variables specified * by a dollar sign ($) followed by its name are substituted in. A type * of 1 indicates that the file name may actually be termcap description @@ -27,7 +27,7 @@ static const char SCCSid[] = "@(#) mytinfo buildpath.c 3.2 92/02/01 public domai #endif /* more memory is allocated for file names every HUNK file names */ -#define HUNK 32 +#define HUNK 32 /* characters that seperate file names in a list */ #define SEPERATORS " :" @@ -58,7 +58,7 @@ int type; { if (files >= size) { size += HUNK; if (path == NULL) - path = (struct term_path *) + path = (struct term_path *) malloc(size * sizeof(struct term_path)); else path = (struct term_path *) @@ -77,7 +77,7 @@ int type; { path[files].file = strcpy(s, file); } path[files].type = type; - + return ++files; } @@ -155,7 +155,7 @@ va_dcl if (*s == '$') { s++; j = 0; - while(*s != '\0' && (*s == '_' || isalnum(*s))) + while(*s != '\0' && (*s == '_' || isalnum(*s))) if (j < MAX_NAME) { name[j] = *s++; j++; @@ -171,7 +171,7 @@ va_dcl } else break; } - } else if (*s == '/') + } else if (*s == '/') s++; } else { if (i < MAX_BUF) { @@ -192,7 +192,7 @@ va_dcl while ((s = strsep(&p, SEPERATORS)) != NULL && *s == '\0') ; } - } else + } else if (addfile(line, type) == 0) return NULL; file = va_arg(ap, char *); diff --git a/lib/libmytinfo/config.h b/lib/libmytinfo/config.h index 486fa3a..87afa05 100644 --- a/lib/libmytinfo/config.h +++ b/lib/libmytinfo/config.h @@ -49,7 +49,7 @@ #undef USE_STDARG /* you have a <stdarg.h> */ #undef USE_STDDEF /* you have a <stddef.h> */ -#define const +#define const #define volatile #define noreturn /* a function that doesn't return */ @@ -86,4 +86,4 @@ typedef void *anyptr; #define TERMINFODIR "/usr/lib/terminfo" -#endif +#endif diff --git a/lib/libmytinfo/fillterm.c b/lib/libmytinfo/fillterm.c index 4797f1a..8e120c9 100644 --- a/lib/libmytinfo/fillterm.c +++ b/lib/libmytinfo/fillterm.c @@ -33,13 +33,13 @@ struct term_path *path; { _term_buf.strs[--i] = (char *) -1; _term_buf.name_all = NULL; - + r = _findterm(name, path, buf); switch(r) { case 1: if (_gettcap(buf, &_term_buf, path) != 0) return -3; - _tcapconv(); + _tcapconv(); _tcapdefault(); break; case 2: diff --git a/lib/libmytinfo/findterm.c b/lib/libmytinfo/findterm.c index 04f6ef6..1fe5a9b 100644 --- a/lib/libmytinfo/findterm.c +++ b/lib/libmytinfo/findterm.c @@ -170,7 +170,7 @@ char *file; { *dp++ = '\\'; *dp++ = c; continue; - } + } *dp++ = c; } *dp = '\0'; diff --git a/lib/libmytinfo/gettbin.c b/lib/libmytinfo/gettbin.c index 202f4cb..678a7d8 100644 --- a/lib/libmytinfo/gettbin.c +++ b/lib/libmytinfo/gettbin.c @@ -18,13 +18,13 @@ static const char SCCSid[] = "@(#) mytinfo gettbin.c 3.2 92/02/01 public domain, extern int _boolorder[], _numorder[], _strorder[]; -#ifdef TRUE_BYTE_ORDERING +#ifdef TRUE_BYTE_ORDERING /* 8 bit char, 16 bit short, lsb first, twos complement */ #define convshort(s) (*(short *)(s)) #else -#ifdef TWOS_COPLEMENT +#ifdef TWOS_COPLEMENT /* 8 bit char, 16 bit short, lsb last, twos complement */ #define convshort(s) ((short)(((s[0] & 0377) << 8) | (s[1] & 0377))) @@ -101,7 +101,7 @@ TERMINAL *cur; { s = buf + 12 + sz_names + sz_bools; for(i = 0; i < n_nums && _numorder[i] != -1; i++, s += 2) { - if (convshort(s) == -2) + if (convshort(s) == -2) cur->nums[_numorder[i]] = -1; else if (cur->nums[_numorder[i]] == -2 && convshort(s) != -1) cur->nums[_numorder[i]] = convshort(s); @@ -120,7 +120,7 @@ TERMINAL *cur; { if ((cur->strs[_strorder[i]] = _addstr(strtbl + convshort(s))) == NULL) return 1; - } + } } return 0; diff --git a/lib/libmytinfo/gettcap.c b/lib/libmytinfo/gettcap.c index ac900c2..1424b88 100644 --- a/lib/libmytinfo/gettcap.c +++ b/lib/libmytinfo/gettcap.c @@ -82,7 +82,7 @@ struct term_path *path; { sp++; } else mul = 0; - + } while(*sp != '\0' && *sp != ':') { switch(*sp) { @@ -98,7 +98,7 @@ struct term_path *path; { case 'f': *dp++ = '\f'; break; case 's': *dp++ = ' '; break; - case '^': + case '^': case '\\': case ',': case ':': @@ -177,7 +177,7 @@ struct term_path *path; { } else if (*sp == '?') { *dp++ = '\177'; sp++; - } else + } else *dp++ = '^'; break; case '$': @@ -195,7 +195,7 @@ struct term_path *path; { else sprintf(dp, "$<%d.%d", pad, fract); dp += strlen(dp); - if (mul) + if (mul) *dp++ = '*'; *dp++ = '>'; } @@ -211,7 +211,7 @@ struct term_path *path; { break; if ((ct->strs[ind] = _addstr(entry)) == NULL) return 1; - break; + break; case '#': #ifdef DEBUG putchar('#'); diff --git a/lib/libmytinfo/gettinfo.c b/lib/libmytinfo/gettinfo.c index d0ef43b..7b7b445 100644 --- a/lib/libmytinfo/gettinfo.c +++ b/lib/libmytinfo/gettinfo.c @@ -90,7 +90,7 @@ TERMINAL *cur; { case 'f': *dp++ = '\f'; break; case 's': *dp++ = ' '; break; - case '^': + case '^': case '\\': case ',': case ':': @@ -116,7 +116,7 @@ TERMINAL *cur; { c = c * 8 + (*++sp-'0'); switch((char)c) { case 0: - if (flag == 'K') + if (flag == 'K') *dp++ = '\200'; else { *dp++ = '\\'; @@ -161,7 +161,7 @@ TERMINAL *cur; { *dp++ = '0'; } sp++; - } else + } else *dp++ = '^'; break; default: @@ -181,7 +181,7 @@ TERMINAL *cur; { break; if ((ct->strs[ind] = _addstr(entry)) == NULL) return 1; - break; + break; case '#': #ifdef DEBUG putchar('#'); diff --git a/lib/libmytinfo/mkcapsort.c b/lib/libmytinfo/mkcapsort.c index 21c1a4a..9079dcf 100644 --- a/lib/libmytinfo/mkcapsort.c +++ b/lib/libmytinfo/mkcapsort.c @@ -29,7 +29,7 @@ char **sstrnames[NUM_OF_STRS], **sstrcodes[NUM_OF_STRS], **sstrfnames[NUM_OF_STR int main() { register int i; - + i = NUM_OF_BOOLS; while(i) { i--; @@ -37,7 +37,7 @@ main() { sboolcodes[i] = &boolcodes[i]; sboolfnames[i] = &boolfnames[i]; } - + i = NUM_OF_NUMS; while(i) { i--; @@ -119,7 +119,7 @@ main() { printf("};\n\n"); printf("char **_sstrcodes[] = {\n"); - for(i = 0; i < NUM_OF_STRS; i++) + for(i = 0; i < NUM_OF_STRS; i++) printf("\tstrcodes + %d,\n", sstrcodes[i] - strcodes); printf(" (char **) 0\n"); printf("};\n\n"); diff --git a/lib/libmytinfo/mktermhead.c b/lib/libmytinfo/mktermhead.c index f70079b..bacf051 100644 --- a/lib/libmytinfo/mktermhead.c +++ b/lib/libmytinfo/mktermhead.c @@ -2,7 +2,7 @@ * mktermhead.c * * By Ross Ridge - * Public Domain + * Public Domain * 92/06/04 11:38:57 * * mktermhead [-n caps] file diff --git a/lib/libmytinfo/mkversion.c b/lib/libmytinfo/mkversion.c index b34ac73..9fbc12e 100644 --- a/lib/libmytinfo/mkversion.c +++ b/lib/libmytinfo/mkversion.c @@ -2,7 +2,7 @@ * mkversion.c * * By Ross Ridge - * Public Domain + * Public Domain * 92/02/01 07:30:09 * * generates version.c diff --git a/lib/libmytinfo/readcaps.c b/lib/libmytinfo/readcaps.c index 47a76f8..b78bdc1 100644 --- a/lib/libmytinfo/readcaps.c +++ b/lib/libmytinfo/readcaps.c @@ -67,7 +67,7 @@ int len; { c = getc(f); if (c == EOF) return EOF; - + } *s = '\0'; #ifdef TEST @@ -108,7 +108,7 @@ int max; { else buf[count].flag = ' '; } - + c = getfield(f, buf[count].var, MAX_VARNAME); if (c == EOF || c == '\n' || c == 0) return -1; diff --git a/lib/libmytinfo/tcapconv.c b/lib/libmytinfo/tcapconv.c index 6a28b11..3cd4d36 100644 --- a/lib/libmytinfo/tcapconv.c +++ b/lib/libmytinfo/tcapconv.c @@ -30,7 +30,7 @@ static char *C_HT = "\t"; /* * This routine fills in caps that either had defaults under termcap or - * can be manufactured from obsolete termcap capabilities. + * can be manufactured from obsolete termcap capabilities. */ void @@ -56,7 +56,7 @@ _tcapdefault() { } /* vi doesn't use "do", but it does seems to use nl (or '\n') instead */ if (NOTSET(cursor_down)) { - if (DEF(linefeed_if_not_lf)) + if (DEF(linefeed_if_not_lf)) cursor_down = _addstr(linefeed_if_not_lf); else if (linefeed_is_newline != 1) { if (new_line_delay > 0) { @@ -69,7 +69,7 @@ _tcapdefault() { set_scroll_forward_to_lf = 0; if (NOTSET(scroll_forward) && crt_without_scrolling != 1) { set_scroll_forward_to_lf = 1; - if (DEF(linefeed_if_not_lf)) + if (DEF(linefeed_if_not_lf)) scroll_forward = _addstr(linefeed_if_not_lf); else if (linefeed_is_newline != 1) { if (new_line_delay > 0) { diff --git a/lib/libmytinfo/term.h b/lib/libmytinfo/term.h index e91aefa..f2b3a4d 100644 --- a/lib/libmytinfo/term.h +++ b/lib/libmytinfo/term.h @@ -1,5 +1,5 @@ /* - * term.h + * term.h * * This file was generated automatically. * @@ -525,7 +525,7 @@ #define _MAX_CHUNK 640 #endif /* OVERRIDE */ -/* +/* * 92/02/01 07:30:28 * @(#) mytinfo term.tail 3.2 92/02/01 public domain, By Ross Ridge * @@ -604,8 +604,8 @@ typedef struct _terminal { #else #ifdef _USE_TERMIO struct termio prog_mode, shell_mode; -#endif -#endif +#endif +#endif #endif /* else _USE_SGTTY */ #ifdef _USE_WINSZ #ifdef TIOCGWINSZ diff --git a/lib/libmytinfo/termcap.c b/lib/libmytinfo/termcap.c index 8e8a3f3..f914c0b 100644 --- a/lib/libmytinfo/termcap.c +++ b/lib/libmytinfo/termcap.c @@ -31,7 +31,7 @@ char *term, *buf; { int r = -1; int fd; - if (term == NULL) + if (term == NULL) term = getenv("TERM"); if (term == NULL) return 0; @@ -95,7 +95,7 @@ char *term, *buf; { if (_init_tty() == ERR) return 0; - if ((s = getenv("LINES")) != NULL && atoi(s) > 0) + if ((s = getenv("LINES")) != NULL && atoi(s) > 0) lines = atoi(s); if ((s = getenv("COLUMNS")) != NULL && atoi(s) > 0) columns = atoi(s); @@ -113,7 +113,7 @@ tgetnum(cap) char *cap; { int ind; - cap2[0] = cap[0]; + cap2[0] = cap[0]; cap2[1] = cap[1]; cap2[2] = '\0'; @@ -128,7 +128,7 @@ tgetflag(cap) char *cap; { int ind; - cap2[0] = cap[0]; + cap2[0] = cap[0]; cap2[1] = cap[1]; cap2[2] = '\0'; @@ -145,7 +145,7 @@ char **area; { register char *sp, *dp; int ind; - cap2[0] = cap[0]; + cap2[0] = cap[0]; cap2[1] = cap[1]; cap2[2] = '\0'; diff --git a/lib/libmytinfo/terminfo.c b/lib/libmytinfo/terminfo.c index 342e08f..0568588 100644 --- a/lib/libmytinfo/terminfo.c +++ b/lib/libmytinfo/terminfo.c @@ -52,7 +52,7 @@ int *err; { char buf[MAX_BUF]; - if (term == NULL) + if (term == NULL) term = getenv("TERM"); if (term == NULL) RETERR(0, "TERM not set\n") @@ -99,7 +99,7 @@ int *err; { _term_buf.fd = fd; if (_init_tty() == ERR) RETERR(0, "problem initializing tty\n"); - if ((s = getenv("LINES")) != NULL && atoi(s) > 0) + if ((s = getenv("LINES")) != NULL && atoi(s) > 0) lines = atoi(s); if ((s = getenv("COLUMNS")) != NULL && atoi(s) > 0) columns = atoi(s); diff --git a/lib/libmytinfo/tgoto.c b/lib/libmytinfo/tgoto.c index e94a660..1bc735b 100644 --- a/lib/libmytinfo/tgoto.c +++ b/lib/libmytinfo/tgoto.c @@ -32,7 +32,7 @@ tgoto(str, x, y) char *str; int x,y; { register char *sp; - + static char buf[MAX_LINE] = {'\\', '@'}; sp = str = tparm(str, y, x); diff --git a/lib/libmytinfo/tparm.c b/lib/libmytinfo/tparm.c index cdc4297..0cc2c89 100644 --- a/lib/libmytinfo/tparm.c +++ b/lib/libmytinfo/tparm.c @@ -80,7 +80,7 @@ anyptr p; { return 1; else if (type == STRING) *(char **)p = arg_list[argnum].string; - else + else *(int *)p = arg_list[argnum].integer; } else { arg_list[argcnt].type = type; @@ -212,7 +212,7 @@ static int termcap; (UW) %-x subtract parameter FROM the character x and output it as a char (UW) %ax add the character x to parameter (GNU) %a[+*-/=][cp]x - GNU arithmetic. + GNU arithmetic. (UW) %sx subtract parameter FROM the character x %>xy if parameter > character x then add character y to parameter %B convert to BCD (parameter = (parameter/10)*16 + parameter%16) @@ -325,7 +325,7 @@ va_dcl { } ;/* FALLTHROUGH */ case 'C': - if (*sp == 'C') { + if (*sp == 'C') { if (getarg(termcap - 1, INTEGER, &i)) return OOPS; if (i >= 96) { @@ -419,11 +419,11 @@ va_dcl { return OOPS; ;/* FALLTHROUGH */ case '.': - if (termcap && fmt == NULL) + if (termcap && fmt == NULL) fmt = "%c"; ;/* FALLTHROUGH */ case 'd': - if (termcap && fmt == NULL) + if (termcap && fmt == NULL) fmt = "%d"; ;/* FALLTHROUGH */ case '2': @@ -431,7 +431,7 @@ va_dcl { fmt = "%02d"; ;/* FALLTHROUGH */ case '3': - if (termcap && fmt == NULL) + if (termcap && fmt == NULL) fmt = "%03d"; ;/* FALLTHROUGH */ case ':': case ' ': case '#': case 'u': @@ -475,7 +475,7 @@ va_dcl { sp++; fmt = sbuf; while(*fmt != '\0') { - if (*fmt == '$') + if (*fmt == '$') *dp++ = '\\'; *dp++ = *fmt++; } diff --git a/lib/libmytinfo/tputs.c b/lib/libmytinfo/tputs.c index efdda8a..840b3c8 100644 --- a/lib/libmytinfo/tputs.c +++ b/lib/libmytinfo/tputs.c @@ -59,7 +59,7 @@ register int (*outc)(); /* some programmes expect this behaviour from tputs */ if (sp == NULL) { #ifdef DEBUG - fprintf(stderr, "tputs: NULL\n"); + fprintf(stderr, "tputs: NULL\n"); #endif return 0; } @@ -181,7 +181,7 @@ register int (*outc)(); #endif if (cur_term->pad || must_pad) { cnt = ((long) l * cur_term->baudrate - * (multiply_pad ? count : 1) + * (multiply_pad ? count : 1) + (10000L * BITSPERCHAR / 2L)) / (10000L * BITSPERCHAR); #ifdef TEST @@ -247,7 +247,7 @@ char **argv; { test_term.baudrate = 1200; test_term.pad = 0; test_term.padch = 0; - if (argc > 1) + if (argc > 1) test_term.baudrate = atoi(argv[1]); if (argc > 2) test_term.padch = argv[2][0]; diff --git a/lib/libmytinfo/tty.c b/lib/libmytinfo/tty.c index 640fb47..2ba2a7c 100644 --- a/lib/libmytinfo/tty.c +++ b/lib/libmytinfo/tty.c @@ -70,7 +70,7 @@ _lit_output() { if (tcgetattr(cur_term->fd, &old) == -1) return 0; #endif - if (!(old.c_oflag & OPOST) || !(old.c_oflag & ONLCR)) + if (!(old.c_oflag & OPOST) || !(old.c_oflag & ONLCR)) return 0; memcpy((anyptr)&tmp, (anyptr)&old, sizeof(old)); tmp.c_oflag &= ~OPOST; @@ -90,7 +90,7 @@ _norm_output() { tcsetattr(cur_term->fd, TCSADRAIN, &old); #endif } - + int _check_tty() { if ((cur_term->prog_mode.c_iflag & IXON) && cur_term->xon) @@ -245,7 +245,7 @@ _norm_output() { ioctl(cur_term->fd, TIOCSETP, &old); } -#endif +#endif int _check_tty() { |