From 113f86089440d1d87fac1962432f40edcc57248e Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@gnu.org>
Date: Tue, 26 Mar 2002 19:07:55 +0000
Subject: 2002-03-23 James A. Morrison <ja2morri@uwaterloo.ca>
* main.c (main): Use error, not perror and exit. Use ERR, not errno.
* mount.c (mount_root): Likewise.
* rpc.c (rpc_receive_thread): Use error, not perror.
---
nfs/main.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
(limited to 'nfs/main.c')
diff --git a/nfs/main.c b/nfs/main.c
index e38f4061..c5a53cdb 100644
--- a/nfs/main.c
+++ b/nfs/main.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
Written by Michael I. Bushnell, p/BSG.
This file is part of the GNU Hurd.
@@ -345,6 +345,7 @@ parse_startup_opt (int key, char *arg, struct argp_state *state)
int
main (int argc, char **argv)
{
+ error_t err;
struct argp common_argp = { common_options, parse_common_opt };
const struct argp_child argp_children[] =
{ {&common_argp}, {&netfs_std_startup_argp}, {0} };
@@ -378,14 +379,11 @@ main (int argc, char **argv)
}
while ((ret == -1) && (errno == EADDRINUSE));
if (ret == -1)
- {
- perror ("binding main udp socket");
- exit (1);
- }
+ error (1, errno, "binding main udp socket");
- errno = maptime_map (0, 0, &mapped_time);
- if (errno)
- error (2, errno, "mapping time");
+ err = maptime_map (0, 0, &mapped_time);
+ if (err)
+ error (2, err, "mapping time");
cthread_detach (cthread_fork ((cthread_fn_t) timeout_service_thread, 0));
cthread_detach (cthread_fork ((cthread_fn_t) rpc_receive_thread, 0));
--
cgit v1.2.3