Module Name: src
Committed By: roy
Date: Fri Jun 7 13:16:18 UTC 2013
Modified Files:
src/lib/libterminfo: compile.c curterm.c setupterm.c term.c term.h ti.c
tparm.c tputs.c
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libterminfo/compile.c \
src/lib/libterminfo/curterm.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libterminfo/setupterm.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libterminfo/term.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libterminfo/term.h
cvs rdiff -u -r1.2 -r1.3 src/lib/libterminfo/ti.c src/lib/libterminfo/tputs.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libterminfo/tparm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/compile.c
diff -u src/lib/libterminfo/compile.c:1.8 src/lib/libterminfo/compile.c:1.9
--- src/lib/libterminfo/compile.c:1.8 Sun Jun 3 23:19:10 2012
+++ src/lib/libterminfo/compile.c Fri Jun 7 13:16:18 2013
@@ -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 @@ _ti_find_cap(TBUF *tbuf, char type, shor
break;
}
}
-
+
errno = ESRCH;
return NULL;
}
@@ -151,7 +151,7 @@ _ti_find_extra(TBUF *tbuf, const char *c
break;
}
}
-
+
errno = ESRCH;
return NULL;
}
@@ -174,19 +174,19 @@ _ti_store_extra(TIC *tic, int wrn, char
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 @@ _ti_flatten(uint8_t **buf, const TIC *ti
*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 @@ _ti_flatten(uint8_t **buf, const TIC *ti
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 @@ _ti_flatten(uint8_t **buf, const TIC *ti
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 @@ _ti_flatten(uint8_t **buf, const TIC *ti
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 @@ encode_string(const char *term, const ch
{
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 @@ encode_string(const char *term, const ch
*p++ = '\t';
break;
default:
-
/* We should warn here */
case '^':
case ',':
@@ -454,7 +453,7 @@ _ti_compile(char *cap, int flags)
TBUF buf;
TIC *tic;
- _DIAGASSERT(cap != NULL);
+ _DIAGASSERT(cap != NULL);
name = _ti_get_token(&cap, ',');
if (name == NULL) {
Index: src/lib/libterminfo/curterm.c
diff -u src/lib/libterminfo/curterm.c:1.8 src/lib/libterminfo/curterm.c:1.9
--- src/lib/libterminfo/curterm.c:1.8 Wed Oct 5 10:46:08 2011
+++ src/lib/libterminfo/curterm.c Fri Jun 7 13:16:18 2013
@@ -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 @@ _ti_setospeed(TERMINAL *term)
size_t i;
_DIAGASSERT(term != NULL);
-
+
term->_ospeed = 0;
if (tcgetattr(term->fildes, &termios) == 0) {
os = cfgetospeed(&termios);
Index: src/lib/libterminfo/setupterm.c
diff -u src/lib/libterminfo/setupterm.c:1.3 src/lib/libterminfo/setupterm.c:1.4
--- src/lib/libterminfo/setupterm.c:1.3 Mon Oct 3 19:18:55 2011
+++ src/lib/libterminfo/setupterm.c Fri Jun 7 13:16:18 2013
@@ -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 @@ ti_setupterm(TERMINAL **nterm, const cha
_DIAGASSERT(nterm != NULL);
- if (term == NULL)
+ if (term == NULL)
term = getenv("TERM");
if (term == NULL || *term == '\0') {
*nterm = NULL;
@@ -75,7 +75,7 @@ ti_setupterm(TERMINAL **nterm, const cha
}
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 @@ ti_setupterm(TERMINAL **nterm, const cha
/* NOTREACHED */
}
}
-
+
(*nterm)->fildes = fildes;
_ti_setospeed(*nterm);
if (t_generic_type(*nterm))
Index: src/lib/libterminfo/term.c
diff -u src/lib/libterminfo/term.c:1.16 src/lib/libterminfo/term.c:1.17
--- src/lib/libterminfo/term.c:1.16 Wed Jun 6 13:36:58 2012
+++ src/lib/libterminfo/term.c Fri Jun 7 13:16:18 2013
@@ -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 @@ _ti_readterm(TERMINAL *term, const char
term->flags[ind] = 0;
}
}
-
+
num = le16dec(cap);
cap += sizeof(uint16_t);
if (num != 0) {
@@ -134,7 +134,7 @@ _ti_readterm(TERMINAL *term, const char
cap += sizeof(uint16_t);
}
}
-
+
num = le16dec(cap);
cap += sizeof(uint16_t);
if (num != 0) {
@@ -154,7 +154,7 @@ _ti_readterm(TERMINAL *term, const char
cap += len;
}
}
-
+
num = le16dec(cap);
cap += sizeof(uint16_t);
if (num != 0) {
@@ -243,7 +243,7 @@ _ti_dbgetterm(TERMINAL *term, const char
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;
Index: src/lib/libterminfo/term.h
diff -u src/lib/libterminfo/term.h:1.15 src/lib/libterminfo/term.h:1.16
--- src/lib/libterminfo/term.h:1.15 Fri Mar 15 14:27:41 2013
+++ src/lib/libterminfo/term.h Fri Jun 7 13:16:18 2013
@@ -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,
Index: src/lib/libterminfo/ti.c
diff -u src/lib/libterminfo/ti.c:1.2 src/lib/libterminfo/ti.c:1.3
--- src/lib/libterminfo/ti.c:1.2 Thu Feb 4 09:46:26 2010
+++ src/lib/libterminfo/ti.c Fri Jun 7 13:16:18 2013
@@ -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 @@ int
tigetflag(const char *id)
{
- _DIAGASSERT(id != NULL);
+ _DIAGASSERT(id != NULL);
if (cur_term != NULL)
return ti_getflag(cur_term, id);
return ABSENT_BOOLEAN;
@@ -96,8 +96,8 @@ ti_getnum(const TERMINAL *term, const ch
int
tigetnum(const char *id)
{
-
- _DIAGASSERT(id != NULL);
+
+ _DIAGASSERT(id != NULL);
if (cur_term != NULL)
return ti_getnum(cur_term, id);
return CANCELLED_NUMERIC;
@@ -127,7 +127,7 @@ ti_getstr(const TERMINAL *term, const ch
char *
tigetstr(const char *id)
{
-
+
_DIAGASSERT(id != NULL);
if (cur_term != NULL)
return __UNCONST(ti_getstr(cur_term, id));
Index: src/lib/libterminfo/tputs.c
diff -u src/lib/libterminfo/tputs.c:1.2 src/lib/libterminfo/tputs.c:1.3
--- src/lib/libterminfo/tputs.c:1.2 Fri Feb 12 10:36:07 2010
+++ src/lib/libterminfo/tputs.c Fri Jun 7 13:16:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tputs.c,v 1.2 2010/02/12 10:36:07 martin Exp $ */
+/* $NetBSD: tputs.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: tputs.c,v 1.2 2010/02/12 10:36:07 martin Exp $");
+__RCSID("$NetBSD: tputs.c,v 1.3 2013/06/07 13:16:18 roy Exp $");
#include <assert.h>
#include <ctype.h>
@@ -53,8 +53,8 @@ static int
_ti_calcdelay(const char **str, int affcnt, int *mand)
{
int i;
-
- i = 0;
+
+ i = 0;
/* Convert the delay */
while (isdigit(*(const unsigned char *)*str))
i = i * 10 + *(*str)++ - '0';
@@ -85,7 +85,7 @@ _ti_outputdelay(int delay, short os, cha
if (delay < 1 || os < 1 || (size_t)os >= __arraycount(tmspc10))
return;
-
+
mspc10 = tmspc10[os];
delay += mspc10 / 2;
for (delay /= mspc10; delay > 0; delay--)
@@ -137,7 +137,7 @@ ti_puts(const TERMINAL *term, const char
_DIAGASSERT(term != NULL);
_DIAGASSERT(str != NULL);
_DIAGASSERT(outc != NULL);
-
+
dodelay = (str == t_bell(term) ||
str == t_flash_screen(term) ||
(t_xon_xoff(term) == 0 && t_padding_baud_rate(term) != 0));
@@ -168,7 +168,7 @@ tputs(const char *str, int affcnt, int (
return _ti_puts(1, ospeed, PC, str, affcnt,
(int (*)(int, void *))outc, NULL);
}
-
+
int
putp(const char *str)
{
Index: src/lib/libterminfo/tparm.c
diff -u src/lib/libterminfo/tparm.c:1.14 src/lib/libterminfo/tparm.c:1.15
--- src/lib/libterminfo/tparm.c:1.14 Fri Jan 25 17:28:50 2013
+++ src/lib/libterminfo/tparm.c Fri Jun 7 13:16:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tparm.c,v 1.14 2013/01/25 17:28:50 roy Exp $ */
+/* $NetBSD: tparm.c,v 1.15 2013/06/07 13:16:18 roy Exp $ */
/*
* Copyright (c) 2009, 2011, 2013 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: tparm.c,v 1.14 2013/01/25 17:28:50 roy Exp $");
+__RCSID("$NetBSD: tparm.c,v 1.15 2013/06/07 13:16:18 roy Exp $");
#include <sys/param.h>
#include <assert.h>
@@ -44,9 +44,9 @@ __RCSID("$NetBSD: tparm.c,v 1.14 2013/01
#define LONG_STR_MAX ((CHAR_BIT * sizeof(long)) / 3)
#define BUFINC 128 /* Size to increament the terminal buffer by */
-#define VA_LONG_LONG 1
+#define VA_LONG_LONG 1
#define VA_CHAR_INT 2
-//#define VA_CHAR_LONG 3
+//#define VA_CHAR_LONG 3 /* No need for this yet */
static TERMINAL *dumbterm; /* For non thread safe functions */
@@ -97,7 +97,7 @@ static char *
checkbuf(TERMINAL *term, size_t len)
{
char *buf;
-
+
if (term->_bufpos + len >= term->_buflen) {
len = term->_buflen + MAX(len, BUFINC);
buf = realloc(term->_buf, len);
@@ -562,7 +562,7 @@ tiparm(const char *str, ...)
{
va_list va;
char *ret;
-
+
_DIAGASSERT(str != NULL);
va_start(va, str);
@@ -592,7 +592,7 @@ tlparm(const char *str, ...)
{
va_list va;
char *ret;
-
+
_DIAGASSERT(str != NULL);
va_start(va, str);
@@ -607,7 +607,7 @@ _tparm(const char *str, ...)
{
va_list va;
char *ret;
-
+
_DIAGASSERT(str != NULL);
va_start(va, str);
