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

Clean up boogered gcc warning workaround (remove goto completely) and remove

Browse Source 
a redundant `if'.
This commit is contained in:
tv 1998-06-13 04:28:46 +00:00
parent bbdf63fab8
commit ffc503dc80
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/nfs/nfs_boot.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_boot.c,v 1.45 1998/04/25 17:41:01 matt Exp $ */ /* $NetBSD: nfs_boot.c,v 1.46 1998/06/13 04:28:46 tv Exp $ */
/*- /*-
* Copyright (c) 1995, 1997 The NetBSD Foundation, Inc. * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@ -127,22 +127,17 @@ nfs_boot_init(nd, procp)
printf("nfs_boot: trying BOOTP\n"); printf("nfs_boot: trying BOOTP\n");
#endif #endif
error = nfs_bootdhcp(ifp, nd, procp); error = nfs_bootdhcp(ifp, nd, procp);
if (!error)
goto ok;
} }
#endif #endif
#ifdef NFS_BOOT_BOOTPARAM #ifdef NFS_BOOT_BOOTPARAM
if (nfs_boot_bootparam) { if (nfs_boot_bootparam) {
printf("nfs_boot: trying RARP (and RPC/bootparam)\n"); printf("nfs_boot: trying RARP (and RPC/bootparam)\n");
error = nfs_bootparam(ifp, nd, procp); error = nfs_bootparam(ifp, nd, procp);
if (!error)
goto ok;
} }
#endif #endif
if (0) goto ok; /* XXX stupid gcc */ if (error)
return (error); return (error);
ok:
/* /*
* If the gateway address is set, add a default route. * If the gateway address is set, add a default route.
* (The mountd RPCs may go across a gateway.) * (The mountd RPCs may go across a gateway.)
@ -154,8 +149,6 @@ ok:
* Now fetch the NFS file handles as appropriate. * Now fetch the NFS file handles as appropriate.
*/ */
error = nfs_boot_getfh(&nd->nd_root); error = nfs_boot_getfh(&nd->nd_root);
if (error)
return (error);
return (error); return (error);
} }