Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 27 Mar 2016 22:36:32 +0000 (UTC)
From:      Ian Lepore <ian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r297324 - head/sys/nfs
Message-ID:  <201603272236.u2RMaW4o006128@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ian
Date: Sun Mar 27 22:36:32 2016
New Revision: 297324
URL: https://svnweb.freebsd.org/changeset/base/297324

Log:
  Switch bootpc_adjust_interface() from returning int to void.  Its one caller
  doesn't check for errors, and all the errors that can happen result in it
  calling panic anyway, except for one that's really more of a warning (and
  is going to disappear on an upcoming commit anyway).

Modified:
  head/sys/nfs/bootp_subr.c

Modified: head/sys/nfs/bootp_subr.c
==============================================================================
--- head/sys/nfs/bootp_subr.c	Sun Mar 27 22:21:34 2016	(r297323)
+++ head/sys/nfs/bootp_subr.c	Sun Mar 27 22:36:32 2016	(r297324)
@@ -276,7 +276,7 @@ static int	bootpc_call(struct bootpc_glo
 static void	bootpc_fakeup_interface(struct bootpc_ifcontext *ifctx,
 		    struct thread *td);
 
-static int	bootpc_adjust_interface(struct bootpc_ifcontext *ifctx,
+static void	bootpc_adjust_interface(struct bootpc_ifcontext *ifctx,
 		    struct bootpc_globalcontext *gctx, struct thread *td);
 
 static void	bootpc_decode_reply(struct nfsv3_diskless *nd,
@@ -1011,7 +1011,7 @@ bootpc_shutdown_interface(struct bootpc_
 		panic("%s: SIOCDIFADDR, error=%d", __func__, error);
 }
 
-static int
+static void
 bootpc_adjust_interface(struct bootpc_ifcontext *ifctx,
     struct bootpc_globalcontext *gctx, struct thread *td)
 {
@@ -1034,7 +1034,7 @@ bootpc_adjust_interface(struct bootpc_if
 	if (bootpc_ifctx_isresolved(ifctx) == 0) {
 		/* Shutdown interfaces where BOOTP failed */
 		bootpc_shutdown_interface(ifctx, td);
-		return (0);
+		return;
 	}
 
 	printf("Adjusted interface %s", ifctx->ireq.ifr_name);
@@ -1082,11 +1082,9 @@ bootpc_adjust_interface(struct bootpc_if
 		    (RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL, RT_DEFAULT_FIB);
 		if (error != 0) {
 			printf("%s: RTM_ADD, error=%d\n", __func__, error);
-			return (error);
+			return;
 		}
 	}
-
-	return (0);
 }
 
 static int

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603272236.u2RMaW4o006128>