[src/trunk]: src/lib/libterminfo Whitespace

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e4476492b10f
branches:  trunk
changeset: 787227:e4476492b10f
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Jun 07 13:16:18 2013 +0000

description:
Whitespace

diffstat:

 lib/libterminfo/compile.c   |  29 ++++++++++++++---------------
 lib/libterminfo/curterm.c   |   6 +++---
 lib/libterminfo/setupterm.c |  10 +++++-----
 lib/libterminfo/term.c      |  12 ++++++------
 lib/libterminfo/term.h      |   4 ++--
 lib/libterminfo/ti.c        |  12 ++++++------
 lib/libterminfo/tparm.c     |  16 ++++++++--------
 lib/libterminfo/tputs.c     |  14 +++++++-------
 8 files changed, 51 insertions(+), 52 deletions(-)

diffs (truncated from 442 to 300 lines):

diff -r e28f02f1e48b -r e4476492b10f lib/libterminfo/compile.c
--- a/lib/libterminfo/compile.c Fri Jun 07 06:35:11 2013 +0000
+++ b/lib/libterminfo/compile.c Fri Jun 07 13:16:18 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: compile.c,v 1.8 2012/06/03 23:19:10 joerg Exp $ */
+/* $NetBSD: compile.c,v 1.9 2013/06/07 13:16:18 roy Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: compile.c,v 1.8 2012/06/03 23:19:10 joerg Exp $");
+__RCSID("$NetBSD: compile.c,v 1.9 2013/06/07 13:16:18 roy Exp $");
 
 #if !HAVE_NBTOOL_CONFIG_H || HAVE_SYS_ENDIAN_H
 #include <sys/endian.h>
@@ -115,7 +115,7 @@
                        break;
                }
        }
-       
+
        errno = ESRCH;
        return NULL;
 }
@@ -151,7 +151,7 @@
                        break;
                }
        }
-       
+
        errno = ESRCH;
        return NULL;
 }
@@ -174,19 +174,19 @@
                        return 0;
                }
        }
-       
+
        l = strlen(id) + 1;
        if (l > UINT16_T_MAX) {
                dowarn(flags, "%s: %s: cap name is too long", tic->name, id);
                return 0;
        }
-       
+
        if (!_ti_grow_tbuf(&tic->extras,
                l + strl + (sizeof(uint16_t) * 2) + 1))
                return 0;
        le16enc(tic->extras.buf + tic->extras.bufpos, l);
        tic->extras.bufpos += sizeof(uint16_t);
-       memcpy(tic->extras.buf + tic->extras.bufpos, id, l);
+       memcpy(tic->extras.buf + tic->extras.bufpos, id, l);
        tic->extras.bufpos += l;
        tic->extras.buf[tic->extras.bufpos++] = type;
        switch (type) {
@@ -237,14 +237,14 @@
        *buf = malloc(buflen);
        if (*buf == NULL)
                return -1;
-       
+
        cap = *buf;
        *cap++ = 1;
        le16enc(cap, len);
        cap += sizeof(uint16_t);
        memcpy(cap, tic->name, len);
        cap += len;
-       
+
        le16enc(cap, alen);
        cap += sizeof(uint16_t);
        if (tic->alias != NULL) {
@@ -269,7 +269,7 @@
                memcpy(cap, tic->flags.buf, tic->flags.bufpos);
                cap += tic->flags.bufpos;
        }
-       
+
        if (tic->nums.entries == 0) {
                le16enc(cap, 0);
                cap += sizeof(uint16_t);
@@ -281,7 +281,7 @@
                memcpy(cap, tic->nums.buf, tic->nums.bufpos);
                cap += tic->nums.bufpos;
        }
-       
+
        if (tic->strs.entries == 0) {
                le16enc(cap, 0);
                cap += sizeof(uint16_t);
@@ -293,7 +293,7 @@
                memcpy(cap, tic->strs.buf, tic->strs.bufpos);
                cap += tic->strs.bufpos;
        }
-       
+
        if (tic->extras.entries == 0) {
                le16enc(cap, 0);
                cap += sizeof(uint16_t);
@@ -315,7 +315,7 @@
 {
        int slash, i, num;
        char ch, *p, *s, last;
-       
+
        if (_ti_grow_tbuf(tbuf, strlen(str) + 1) == NULL)
                return -1;
        p = s = tbuf->buf + tbuf->bufpos;
@@ -392,7 +392,6 @@
                        *p++ = '\t';
                        break;
                default:
-                                       
                        /* We should warn here */
                case '^':
                case ',':
@@ -454,7 +453,7 @@
        TBUF buf;
        TIC *tic;
 
-       _DIAGASSERT(cap != NULL);       
+       _DIAGASSERT(cap != NULL);
 
        name = _ti_get_token(&cap, ',');
        if (name == NULL) {
diff -r e28f02f1e48b -r e4476492b10f lib/libterminfo/curterm.c
--- a/lib/libterminfo/curterm.c Fri Jun 07 06:35:11 2013 +0000
+++ b/lib/libterminfo/curterm.c Fri Jun 07 13:16:18 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: curterm.c,v 1.8 2011/10/05 10:46:08 roy Exp $ */
+/* $NetBSD: curterm.c,v 1.9 2013/06/07 13:16:18 roy Exp $ */
 
 /*
  * Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: curterm.c,v 1.8 2011/10/05 10:46:08 roy Exp $");
+__RCSID("$NetBSD: curterm.c,v 1.9 2013/06/07 13:16:18 roy Exp $");
 
 #include <assert.h>
 #include <stdlib.h>
@@ -64,7 +64,7 @@
        size_t i;
 
        _DIAGASSERT(term != NULL);
-       
+
        term->_ospeed = 0;
        if (tcgetattr(term->fildes, &termios) == 0) {
                os = cfgetospeed(&termios);
diff -r e28f02f1e48b -r e4476492b10f lib/libterminfo/setupterm.c
--- a/lib/libterminfo/setupterm.c       Fri Jun 07 06:35:11 2013 +0000
+++ b/lib/libterminfo/setupterm.c       Fri Jun 07 13:16:18 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: setupterm.c,v 1.3 2011/10/03 19:18:55 roy Exp $ */
+/* $NetBSD: setupterm.c,v 1.4 2013/06/07 13:16:18 roy Exp $ */
 
 /*
  * Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: setupterm.c,v 1.3 2011/10/03 19:18:55 roy Exp $");
+__RCSID("$NetBSD: setupterm.c,v 1.4 2013/06/07 13:16:18 roy Exp $");
 
 #include <assert.h>
 #include <err.h>
@@ -67,7 +67,7 @@
 
        _DIAGASSERT(nterm != NULL);
 
-               if (term == NULL)
+       if (term == NULL)
                term = getenv("TERM");
        if (term == NULL || *term == '\0') {
                *nterm = NULL;
@@ -75,7 +75,7 @@
        }
        if (fildes == STDOUT_FILENO && !isatty(fildes))
                fildes = STDERR_FILENO;
-       
+
        *nterm = calloc(1, sizeof(**nterm));
        if (*nterm == NULL)
                reterr(-1, "not enough memory to create terminal structure");
@@ -98,7 +98,7 @@
                        /* NOTREACHED */
                }
        }
-       
+
        (*nterm)->fildes = fildes;
        _ti_setospeed(*nterm);
        if (t_generic_type(*nterm))
diff -r e28f02f1e48b -r e4476492b10f lib/libterminfo/term.c
--- a/lib/libterminfo/term.c    Fri Jun 07 06:35:11 2013 +0000
+++ b/lib/libterminfo/term.c    Fri Jun 07 13:16:18 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: term.c,v 1.16 2012/06/06 13:36:58 joerg Exp $ */
+/* $NetBSD: term.c,v 1.17 2013/06/07 13:16:18 roy Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: term.c,v 1.16 2012/06/06 13:36:58 joerg Exp $");
+__RCSID("$NetBSD: term.c,v 1.17 2013/06/07 13:16:18 roy Exp $");
 
 #include <sys/stat.h>
 
@@ -119,7 +119,7 @@
                                term->flags[ind] = 0;
                }
        }
-       
+
        num = le16dec(cap);
        cap += sizeof(uint16_t);
        if (num != 0) {
@@ -134,7 +134,7 @@
                        cap += sizeof(uint16_t);
                }
        }
-       
+
        num = le16dec(cap);
        cap += sizeof(uint16_t);
        if (num != 0) {
@@ -154,7 +154,7 @@
                        cap += len;
                }
        }
-       
+
        num = le16dec(cap);
        cap += sizeof(uint16_t);
        if (num != 0) {
@@ -243,7 +243,7 @@
                data8 = data;
                if (data8[0] != 1)
                        goto fail;
-       } else  if (data8[0] != 1)
+       } else if (data8[0] != 1)
                goto fail;
        else if (klen + 3 >= len || le16dec(data8 + 1) != klen)
                goto fail;
diff -r e28f02f1e48b -r e4476492b10f lib/libterminfo/term.h
--- a/lib/libterminfo/term.h    Fri Jun 07 06:35:11 2013 +0000
+++ b/lib/libterminfo/term.h    Fri Jun 07 13:16:18 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: term.h,v 1.15 2013/03/15 14:27:41 njoly Exp $ */
+/* $NetBSD: term.h,v 1.16 2013/06/07 13:16:18 roy Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2011, 2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 /* Define available terminfo flags */
 enum TIFLAGS {
-               TICODE_bw,
+       TICODE_bw,
        TICODE_am,
        TICODE_bce,
        TICODE_ccc,
diff -r e28f02f1e48b -r e4476492b10f lib/libterminfo/ti.c
--- a/lib/libterminfo/ti.c      Fri Jun 07 06:35:11 2013 +0000
+++ b/lib/libterminfo/ti.c      Fri Jun 07 13:16:18 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ti.c,v 1.2 2010/02/04 09:46:26 roy Exp $ */
+/* $NetBSD: ti.c,v 1.3 2013/06/07 13:16:18 roy Exp $ */
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ti.c,v 1.2 2010/02/04 09:46:26 roy Exp $");
+__RCSID("$NetBSD: ti.c,v 1.3 2013/06/07 13:16:18 roy Exp $");
 
 #include <assert.h>
 #include <string.h>
@@ -60,7 +60,7 @@
 tigetflag(const char *id)
 {
 
-       _DIAGASSERT(id != NULL);        
+       _DIAGASSERT(id != NULL);
        if (cur_term != NULL)
                return ti_getflag(cur_term, id);
        return ABSENT_BOOLEAN;