Module Name: src
Committed By: pooka
Date: Fri Nov 5 13:52:42 UTC 2010
Modified Files:
src/sbin/ifconfig: ifconfig.c
src/sbin/route: route.c
src/usr.sbin/envstat: envstat.c
Log Message:
adapt to new rumpclient_init() signature
To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/sbin/ifconfig/ifconfig.c
cvs rdiff -u -r1.124 -r1.125 src/sbin/route/route.c
cvs rdiff -u -r1.81 -r1.82 src/usr.sbin/envstat/envstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/ifconfig.c
diff -u src/sbin/ifconfig/ifconfig.c:1.221 src/sbin/ifconfig/ifconfig.c:1.222
--- src/sbin/ifconfig/ifconfig.c:1.221 Thu Nov 4 23:31:12 2010
+++ src/sbin/ifconfig/ifconfig.c Fri Nov 5 13:52:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ifconfig.c,v 1.221 2010/11/04 23:31:12 pooka Exp $ */
+/* $NetBSD: ifconfig.c,v 1.222 2010/11/05 13:52:41 pooka Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1983, 1993\
The Regents of the University of California. All rights reserved.");
-__RCSID("$NetBSD: ifconfig.c,v 1.221 2010/11/04 23:31:12 pooka Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.222 2010/11/05 13:52:41 pooka Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -541,10 +541,8 @@
const char *ifname;
#ifdef RUMP_ACTION
- int error;
-
- if ((error = rumpclient_init()) != 0)
- errx(1, "rump client init: %s", strerror(error));
+ if (rumpclient_init() == -1)
+ err(1, "rump client init");
#endif
memset(match, 0, sizeof(match));
Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.124 src/sbin/route/route.c:1.125
--- src/sbin/route/route.c:1.124 Thu Nov 4 23:38:18 2010
+++ src/sbin/route/route.c Fri Nov 5 13:52:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.124 2010/11/04 23:38:18 pooka Exp $ */
+/* $NetBSD: route.c,v 1.125 2010/11/05 13:52:41 pooka Exp $ */
/*
* Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: route.c,v 1.124 2010/11/04 23:38:18 pooka Exp $");
+__RCSID("$NetBSD: route.c,v 1.125 2010/11/05 13:52:41 pooka Exp $");
#endif
#endif /* not lint */
@@ -163,9 +163,8 @@
int ch;
#ifdef RUMP_ACTION
- int error;
- if ((error = rumpclient_init()) != 0)
- errx(1, "rump client init: %s", strerror(error));
+ if (rumpclient_init() == -1)
+ err(1, "rump client init");
#endif
if (argc < 2)
Index: src/usr.sbin/envstat/envstat.c
diff -u src/usr.sbin/envstat/envstat.c:1.81 src/usr.sbin/envstat/envstat.c:1.82
--- src/usr.sbin/envstat/envstat.c:1.81 Fri Nov 5 13:42:37 2010
+++ src/usr.sbin/envstat/envstat.c Fri Nov 5 13:52:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: envstat.c,v 1.81 2010/11/05 13:42:37 pooka Exp $ */
+/* $NetBSD: envstat.c,v 1.82 2010/11/05 13:52:42 pooka Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: envstat.c,v 1.81 2010/11/05 13:42:37 pooka Exp $");
+__RCSID("$NetBSD: envstat.c,v 1.82 2010/11/05 13:52:42 pooka Exp $");
#endif /* not lint */
#include <stdio.h>
@@ -150,9 +150,8 @@
FILE *cf;
#ifdef RUMP_ACTION
- int error;
- if ((error = rumpclient_init()) != 0)
- errx(1, "rumpclient init failed: %s", strerror(error));
+ if (rumpclient_init() == -1)
+ err(1, "rumpclient init failed");
#endif
setprogname(argv[0]);
