Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some braces to make egcs happy.

Browse Source
This commit is contained in:
thorpej 1998-08-18 23:50:08 +00:00
parent 8021b2ae29
commit e79648d085
6 changed files with 30 additions and 21 deletions

7
lib/libc/db/btree/bt_put.c

@ -1,4 +1,4 @@
/* $NetBSD: bt_put.c,v 1.10 1997/07/21 14:06:35 jtc Exp $ */
/* $NetBSD: bt_put.c,v 1.11 1998/08/18 23:50:08 thorpej Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94";
#else
__RCSID("$NetBSD: bt_put.c,v 1.10 1997/07/21 14:06:35 jtc Exp $");
__RCSID("$NetBSD: bt_put.c,v 1.11 1998/08/18 23:50:08 thorpej Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -231,7 +231,7 @@ delete: if (__bt_dleaf(t, key, h, index) == RET_ERROR) {
t->bt_cursor.pg.pgno == h->pgno && t->bt_cursor.pg.index >= index)
++t->bt_cursor.pg.index;
if (t->bt_order == NOT)
if (t->bt_order == NOT) {
if (h->nextpg == P_INVALID) {
if (index == NEXTINDEX(h) - 1) {
t->bt_order = FORWARD;
@ -245,6 +245,7 @@ delete: if (__bt_dleaf(t, key, h, index) == RET_ERROR) {
t->bt_last.pgno = h->pgno;
}
}
}
mpool_put(t->bt_mp, h, MPOOL_DIRTY);

7
lib/libc/db/hash/hash_bigkey.c

@ -1,4 +1,4 @@
/* $NetBSD: hash_bigkey.c,v 1.7 1997/07/13 18:52:03 christos Exp $ */
/* $NetBSD: hash_bigkey.c,v 1.8 1998/08/18 23:50:08 thorpej Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)hash_bigkey.c 8.3 (Berkeley) 5/31/94";
#else
__RCSID("$NetBSD: hash_bigkey.c,v 1.7 1997/07/13 18:52:03 christos Exp $");
__RCSID("$NetBSD: hash_bigkey.c,v 1.8 1998/08/18 23:50:08 thorpej Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -128,7 +128,7 @@ __big_insert(hashp, bufp, key, val)
if (!bufp)
return (-1);
n = p[0];
if (!key_size)
if (!key_size) {
if (FREESPACE(p)) {
move_bytes = MIN(FREESPACE(p), val_size);
off = OFFSET(p) - move_bytes;
@ -141,6 +141,7 @@ __big_insert(hashp, bufp, key, val)
OFFSET(p) = off;
} else
p[n - 2] = FULL_KEY;
}
p = (u_int16_t *)bufp->page;
cp = bufp->page;
bufp->flags |= BUF_MOD;

10
lib/libc/db/recno/rec_close.c

@ -1,4 +1,4 @@
/* $NetBSD: rec_close.c,v 1.9 1997/07/21 14:06:43 jtc Exp $ */
/* $NetBSD: rec_close.c,v 1.10 1998/08/18 23:50:09 thorpej Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)rec_close.c 8.6 (Berkeley) 8/18/94";
#else
__RCSID("$NetBSD: rec_close.c,v 1.9 1997/07/21 14:06:43 jtc Exp $");
__RCSID("$NetBSD: rec_close.c,v 1.10 1998/08/18 23:50:09 thorpej Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -87,13 +87,15 @@ __rec_close(dbp)
if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize))
status = RET_ERROR;
if (!F_ISSET(t, R_INMEM))
if (!F_ISSET(t, R_INMEM)) {
if (F_ISSET(t, R_CLOSEFP)) {
if (fclose(t->bt_rfp))
status = RET_ERROR;
} else
} else {
if (close(t->bt_rfd))
status = RET_ERROR;
}
}
if (__bt_close(dbp) == RET_ERROR)
status = RET_ERROR;

10
lib/libc/gen/__fts13.c

@ -1,4 +1,4 @@
/* $NetBSD: __fts13.c,v 1.5 1998/02/27 18:05:09 perry Exp $ */
/* $NetBSD: __fts13.c,v 1.6 1998/08/18 23:52:30 thorpej Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#else
__RCSID("$NetBSD: __fts13.c,v 1.5 1998/02/27 18:05:09 perry Exp $");
__RCSID("$NetBSD: __fts13.c,v 1.6 1998/08/18 23:52:30 thorpej Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -323,12 +323,13 @@ fts_read(sp)
if (instr == FTS_FOLLOW &&
(p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
p->fts_info = fts_stat(sp, p, 1);
if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR))
if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
if ((p->fts_symfd = open(".", O_RDONLY, 0)) < 0) {
p->fts_errno = errno;
p->fts_info = FTS_ERR;
} else
p->fts_flags |= FTS_SYMFOLLOW;
}
return (p);
}
@ -411,13 +412,14 @@ next: tmp = p;
goto next;
if (p->fts_instr == FTS_FOLLOW) {
p->fts_info = fts_stat(sp, p, 1);
if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR))
if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
if ((p->fts_symfd =
open(".", O_RDONLY, 0)) < 0) {
p->fts_errno = errno;
p->fts_info = FTS_ERR;
} else
p->fts_flags |= FTS_SYMFOLLOW;
}
p->fts_instr = FTS_NOINSTR;
}

7
lib/libc/gen/syslog.c

@ -1,4 +1,4 @@
/* $NetBSD: syslog.c,v 1.16 1998/07/27 14:16:35 mycroft Exp $ */
/* $NetBSD: syslog.c,v 1.17 1998/08/18 23:52:31 thorpej Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95";
#else
__RCSID("$NetBSD: syslog.c,v 1.16 1998/07/27 14:16:35 mycroft Exp $");
__RCSID("$NetBSD: syslog.c,v 1.17 1998/08/18 23:52:31 thorpej Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -275,12 +275,13 @@ openlog(ident, logstat, logfac)
(void)fcntl(LogFile, F_SETFD, 1);
}
}
if (LogFile != -1 && !connected)
if (LogFile != -1 && !connected) {
if (connect(LogFile, &SyslogAddr, sizeof(SyslogAddr)) == -1) {
(void)close(LogFile);
LogFile = -1;
} else
connected = 1;
}
}
void

10
lib/libc/gen/uname.c

@ -1,4 +1,4 @@
/* $NetBSD: uname.c,v 1.4 1997/07/21 14:07:43 jtc Exp $ */
/* $NetBSD: uname.c,v 1.5 1998/08/18 23:52:31 thorpej Exp $ */
/*-
* Copyright (c) 1994
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)uname.c 8.1 (Berkeley) 1/4/94";
#else
__RCSID("$NetBSD: uname.c,v 1.4 1997/07/21 14:07:43 jtc Exp $");
__RCSID("$NetBSD: uname.c,v 1.5 1998/08/18 23:52:31 thorpej Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -86,12 +86,14 @@ uname(name)
if (sysctl(mib, 2, &name->version, &len, NULL, 0) == -1)
rval = -1;
else
for (p = name->version; len--; ++p)
if (*p == '\n' || *p == '\t')
for (p = name->version; len--; ++p) {
if (*p == '\n' || *p == '\t') {
if (len > 1)
*p = ' ';
else
*p = '\0';
}
}
mib[0] = CTL_HW;
mib[1] = HW_MACHINE;