Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src/lib Back out changes committed as part of ticket #195 whi...
details: https://anonhg.NetBSD.org/src/rev/f0536aa4bc7a
branches: netbsd-6
changeset: 774035:f0536aa4bc7a
user: riz <riz%NetBSD.org@localhost>
date: Mon Apr 23 23:40:40 2012 +0000
description:
Back out changes committed as part of ticket #195 which were apparently
not intended as part of the pullup request. Should fix netbsd-6 build.
diffstat:
lib/libc/stdlib/jemalloc.c | 7 +-
lib/libintl/gettext.c | 14 ++--
lib/libintl/textdomain.c | 7 +-
lib/libkvm/kvm_getloadavg.c | 10 +-
lib/librmt/rmtlib.c | 12 +-
lib/librumpclient/rumpclient.c | 10 +-
lib/libskey/skeysubr.c | 8 +-
lib/libwrap/clean_exit.c | 8 +-
lib/libwrap/diag.c | 32 ++++----
lib/libwrap/eval.c | 28 ++++----
lib/libwrap/fix_options.c | 7 +-
lib/libwrap/hosts_access.c | 108 +++++++++++++++++-------------
lib/libwrap/hosts_ctl.c | 11 ++-
lib/libwrap/misc.c | 20 +++--
lib/libwrap/options.c | 143 ++++++++++++++++++++++------------------
lib/libwrap/percent_x.c | 23 +++---
lib/libwrap/refuse.c | 8 +-
lib/libwrap/rfc931.c | 30 ++++---
lib/libwrap/shell_cmd.c | 12 +-
lib/libwrap/socket.c | 20 ++--
lib/libwrap/tcpd.h | 72 ++++++++++---------
lib/libwrap/update.c | 11 +-
lib/liby/yyerror.c | 7 +-
23 files changed, 326 insertions(+), 282 deletions(-)
diffs (truncated from 1646 to 300 lines):
diff -r 679945985bab -r f0536aa4bc7a lib/libc/stdlib/jemalloc.c
--- a/lib/libc/stdlib/jemalloc.c Mon Apr 23 16:55:34 2012 +0000
+++ b/lib/libc/stdlib/jemalloc.c Mon Apr 23 23:40:40 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: jemalloc.c,v 1.24.6.1 2012/04/23 16:49:02 riz Exp $ */
+/* $NetBSD: jemalloc.c,v 1.24.6.2 2012/04/23 23:40:40 riz Exp $ */
/*-
* Copyright (C) 2006,2007 Jason Evans <jasone%FreeBSD.org@localhost>.
@@ -118,7 +118,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */
-__RCSID("$NetBSD: jemalloc.c,v 1.24.6.1 2012/04/23 16:49:02 riz Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.24.6.2 2012/04/23 23:40:40 riz Exp $");
#ifdef __FreeBSD__
#include "libc_private.h"
@@ -3227,8 +3227,7 @@
"");
_malloc_message("Chunk size: ", umax2s(chunksize, s), "", "");
- _malloc_message(" (2^", umax2s((size_t)opt_chunk_2pow, s),
- ")\n", "");
+ _malloc_message(" (2^", umax2s(opt_chunk_2pow, s), ")\n", "");
#ifdef MALLOC_STATS
{
diff -r 679945985bab -r f0536aa4bc7a lib/libintl/gettext.c
--- a/lib/libintl/gettext.c Mon Apr 23 16:55:34 2012 +0000
+++ b/lib/libintl/gettext.c Mon Apr 23 23:40:40 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gettext.c,v 1.26.2.1 2012/04/23 16:48:59 riz Exp $ */
+/* $NetBSD: gettext.c,v 1.26.2.2 2012/04/23 23:40:40 riz Exp $ */
/*-
* Copyright (c) 2000, 2001 Citrus Project,
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: gettext.c,v 1.26.2.1 2012/04/23 16:48:59 riz Exp $");
+__RCSID("$NetBSD: gettext.c,v 1.26.2.2 2012/04/23 23:40:40 riz Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -303,8 +303,8 @@
get_sysdep_string_table(struct mosysdepstr_h **table_h, uint32_t *ofstable,
uint32_t nstrings, uint32_t magic, char *base)
{
- unsigned int i;
- int j, count;
+ int i, j;
+ int count;
size_t l;
struct mosysdepstr *table;
@@ -398,7 +398,7 @@
uint32_t magic;
struct moentry *stable;
size_t l;
- unsigned int i;
+ int i;
char *v;
uint32_t *ofstable;
@@ -480,7 +480,7 @@
struct moentry_h *p;
struct mo *mo;
size_t l, headerlen;
- unsigned int i;
+ int i;
char *v;
struct mohandle *mohandle = &db->mohandle;
@@ -772,7 +772,7 @@
/* avoid possible infinite loop, when the data is not sorted */
if (omiddle == middle)
break;
- if ((size_t)middle >= mohandle->mo.mo_nstring)
+ if (middle < 0 || middle >= mohandle->mo.mo_nstring)
break;
n = strcmp(msgid, mohandle->mo.mo_otable[middle].off);
diff -r 679945985bab -r f0536aa4bc7a lib/libintl/textdomain.c
--- a/lib/libintl/textdomain.c Mon Apr 23 16:55:34 2012 +0000
+++ b/lib/libintl/textdomain.c Mon Apr 23 23:40:40 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: textdomain.c,v 1.12.30.1 2012/04/23 16:49:00 riz Exp $ */
+/* $NetBSD: textdomain.c,v 1.12.30.2 2012/04/23 23:40:40 riz Exp $ */
/*-
* Copyright (c) 2000, 2001 Citrus Project,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: textdomain.c,v 1.12.30.1 2012/04/23 16:49:00 riz Exp $");
+__RCSID("$NetBSD: textdomain.c,v 1.12.30.2 2012/04/23 23:40:40 riz Exp $");
#include <sys/param.h>
@@ -39,8 +39,7 @@
#include "pathnames.h"
static struct domainbinding __default_binding = {
- .path = { _PATH_TEXTDOMAIN },
- .domainname = { DEFAULT_DOMAINNAME },
+ NULL, DEFAULT_DOMAINNAME, _PATH_TEXTDOMAIN,
};
struct domainbinding *__bindings = &__default_binding;
char __current_domainname[PATH_MAX] = DEFAULT_DOMAINNAME;
diff -r 679945985bab -r f0536aa4bc7a lib/libkvm/kvm_getloadavg.c
--- a/lib/libkvm/kvm_getloadavg.c Mon Apr 23 16:55:34 2012 +0000
+++ b/lib/libkvm/kvm_getloadavg.c Mon Apr 23 23:40:40 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_getloadavg.c,v 1.10.8.1 2012/04/23 16:48:53 riz Exp $ */
+/* $NetBSD: kvm_getloadavg.c,v 1.10.8.2 2012/04/23 23:40:40 riz Exp $ */
/*-
* Copyright (c) 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)kvm_getloadavg.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_getloadavg.c,v 1.10.8.1 2012/04/23 16:48:53 riz Exp $");
+__RCSID("$NetBSD: kvm_getloadavg.c,v 1.10.8.2 2012/04/23 23:40:40 riz Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,11 +56,11 @@
#include "kvm_private.h"
static struct nlist nl[] = {
- { .n_name = "_averunnable" },
+ { "_averunnable" },
#define X_AVERUNNABLE 0
- { .n_name = "_fscale" },
+ { "_fscale" },
#define X_FSCALE 1
- { .n_name = "" },
+ { "" },
};
/*
diff -r 679945985bab -r f0536aa4bc7a lib/librmt/rmtlib.c
--- a/lib/librmt/rmtlib.c Mon Apr 23 16:55:34 2012 +0000
+++ b/lib/librmt/rmtlib.c Mon Apr 23 23:40:40 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rmtlib.c,v 1.25.4.1 2012/04/23 16:49:03 riz Exp $ */
+/* $NetBSD: rmtlib.c,v 1.25.4.2 2012/04/23 23:40:41 riz Exp $ */
/*
* rmt --- remote tape emulator subroutines
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: rmtlib.c,v 1.25.4.1 2012/04/23 16:49:03 riz Exp $");
+__RCSID("$NetBSD: rmtlib.c,v 1.25.4.2 2012/04/23 23:40:41 riz Exp $");
#define RMTIOCTL 1
/* #define USE_REXEC 1 */ /* rexec code courtesy of Dan Kegel, srs!dan */
@@ -114,7 +114,7 @@
blen = strlen(buf);
pstat = signal(SIGPIPE, SIG_IGN);
- if ((size_t)write(WRITE(fildes), buf, blen) == blen) {
+ if (write(WRITE(fildes), buf, blen) == blen) {
signal(SIGPIPE, pstat);
return 0;
}
@@ -254,7 +254,7 @@
char device[BUFMAGIC];
char login[BUFMAGIC];
char *sys, *dev, *user;
- const char *rshpath, *rsh;
+ char *rshpath, *rsh;
_DIAGASSERT(path != NULL);
@@ -422,7 +422,7 @@
if (command(fildes, buffer) == -1 || (rv = status(fildes)) == -1)
return -1;
- if (rv > (int)nbyte)
+ if (rv > nbyte)
rv = (int)nbyte;
for (rc = rv, p = buf; rc > 0; rc -= nread, p += nread) {
@@ -453,7 +453,7 @@
return -1;
pstat = signal(SIGPIPE, SIG_IGN);
- if ((size_t)write(WRITE(fildes), buf, nbyte) == nbyte) {
+ if (write(WRITE(fildes), buf, nbyte) == nbyte) {
signal(SIGPIPE, pstat);
return status(fildes);
}
diff -r 679945985bab -r f0536aa4bc7a lib/librumpclient/rumpclient.c
--- a/lib/librumpclient/rumpclient.c Mon Apr 23 16:55:34 2012 +0000
+++ b/lib/librumpclient/rumpclient.c Mon Apr 23 23:40:40 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.47.2.1 2012/04/23 16:49:03 riz Exp $ */
+/* $NetBSD: rumpclient.c,v 1.47.2.2 2012/04/23 23:40:41 riz Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: rumpclient.c,v 1.47.2.1 2012/04/23 16:49:03 riz Exp $");
+__RCSID("$NetBSD: rumpclient.c,v 1.47.2.2 2012/04/23 23:40:41 riz Exp $");
#include <sys/param.h>
#include <sys/event.h>
@@ -588,8 +588,8 @@
dupgood(int myfd, int mustchange)
{
int ofds[4];
+ int i;
int sverrno;
- unsigned int i;
for (i = 0; (myfd <= 2 || mustchange) && myfd != -1; i++) {
assert(i < __arraycount(ofds));
@@ -605,7 +605,7 @@
if (myfd == -1 && i > 0)
sverrno = errno;
- while (i-- > 0) {
+ for (i--; i >= 0; i--) {
host_close(ofds[i]);
}
@@ -740,7 +740,7 @@
return dlsym(handle, symbol);
}
-__weak_alias(rumphijack_dlsym,rumpclient__dlsym)
+__weak_alias(rumphijack_dlsym,rumpclient__dlsym);
static pid_t init_done = 0;
diff -r 679945985bab -r f0536aa4bc7a lib/libskey/skeysubr.c
--- a/lib/libskey/skeysubr.c Mon Apr 23 16:55:34 2012 +0000
+++ b/lib/libskey/skeysubr.c Mon Apr 23 23:40:40 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: skeysubr.c,v 1.26.42.1 2012/04/23 16:48:52 riz Exp $ */
+/* $NetBSD: skeysubr.c,v 1.26.42.2 2012/04/23 23:40:41 riz Exp $ */
/* S/KEY v1.1b (skeysubr.c)
*
@@ -15,7 +15,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: skeysubr.c,v 1.26.42.1 2012/04/23 16:48:52 riz Exp $");
+__RCSID("$NetBSD: skeysubr.c,v 1.26.42.2 2012/04/23 23:40:41 riz Exp $");
#include <ctype.h>
#include <stdio.h>
@@ -69,7 +69,7 @@
#if 0
{ "rmd160", keycrunch_rmd160, f_rmd160 },
#endif
- { NULL, NULL, NULL }
+ { NULL }
};
/*
@@ -479,7 +479,7 @@
}
/* Get current hash type */
-const char *skey_get_algorithm(void)
+const char *skey_get_algorithm()
{
return(skey_algorithm_table[skey_hash_type].name);
}
diff -r 679945985bab -r f0536aa4bc7a lib/libwrap/clean_exit.c
--- a/lib/libwrap/clean_exit.c Mon Apr 23 16:55:34 2012 +0000
+++ b/lib/libwrap/clean_exit.c Mon Apr 23 23:40:40 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clean_exit.c,v 1.4.66.1 2012/04/23 16:48:57 riz Exp $ */
+/* $NetBSD: clean_exit.c,v 1.4.66.2 2012/04/23 23:40:41 riz Exp $ */
/*
* clean_exit() cleans up and terminates the program. It should be called
@@ -15,7 +15,7 @@
#if 0
static char sccsid[] = "@(#) clean_exit.c 1.4 94/12/28 17:42:19";
#else
-__RCSID("$NetBSD: clean_exit.c,v 1.4.66.1 2012/04/23 16:48:57 riz Exp $");
+__RCSID("$NetBSD: clean_exit.c,v 1.4.66.2 2012/04/23 23:40:41 riz Exp $");
#endif
#endif
@@ -27,8 +27,8 @@
Home |
Main Index |
Thread Index |
Old Index