upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 09:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't call mediaVerify() in quite so many places.

Browse source
This commit is contained in:
Jordan K. Hubbard 1995-05-20 11:13:58 +00:00
parent 8f1fd59b90
commit 8568ba4e73
7 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
release/sysinstall/dist.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.10 1995/05/19 17:19:39 jkh Exp $
* $Id: dist.c,v 1.11 1995/05/20 00:13:08 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -248,7 +248,5 @@ distExtract(char *parent, Distribution *me)
void
distExtractAll(void)
{
if (!mediaVerify())
return;
distExtract(NULL, DistTable);
}

6
release/sysinstall/install.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: install.c,v 1.33 1995/05/20 08:31:40 jkh Exp $
* $Id: install.c,v 1.34 1995/05/20 10:33:03 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -72,8 +72,6 @@ preInstallCheck(void)
msgConfirm("You haven't told me what distributions to load yet!\nPlease select a distribution from the Distributions menu.");
return FALSE;
}
if (!mediaVerify())
return FALSE;
return TRUE;
}
@ -153,6 +151,8 @@ int
installCommit(char *str)
{
installInitial();
if (!mediaVerify())
return 0;
distExtractAll();
installFinal();
return 0;

5
release/sysinstall/media.c
View file

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: media.c,v 1.9 1995/05/20 10:33:06 jkh Exp $
* $Id: media.c,v 1.10 1995/05/20 11:10:33 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -218,9 +218,6 @@ mediaOpen(char *parent, char *me)
{
char fname[FILENAME_MAX];
if (!mediaVerify())
return NULL;
if (parent)
snprintf(fname, FILENAME_MAX, "%s%s", parent, me);
else

6
usr.sbin/sade/install.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: install.c,v 1.33 1995/05/20 08:31:40 jkh Exp $
* $Id: install.c,v 1.34 1995/05/20 10:33:03 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -72,8 +72,6 @@ preInstallCheck(void)
msgConfirm("You haven't told me what distributions to load yet!\nPlease select a distribution from the Distributions menu.");
return FALSE;
}
if (!mediaVerify())
return FALSE;
return TRUE;
}
@ -153,6 +151,8 @@ int
installCommit(char *str)
{
installInitial();
if (!mediaVerify())
return 0;
distExtractAll();
installFinal();
return 0;

4
usr.sbin/sysinstall/dist.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.10 1995/05/19 17:19:39 jkh Exp $
* $Id: dist.c,v 1.11 1995/05/20 00:13:08 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -248,7 +248,5 @@ distExtract(char *parent, Distribution *me)
void
distExtractAll(void)
{
if (!mediaVerify())
return;
distExtract(NULL, DistTable);
}

6
usr.sbin/sysinstall/install.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: install.c,v 1.33 1995/05/20 08:31:40 jkh Exp $
* $Id: install.c,v 1.34 1995/05/20 10:33:03 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -72,8 +72,6 @@ preInstallCheck(void)
msgConfirm("You haven't told me what distributions to load yet!\nPlease select a distribution from the Distributions menu.");
return FALSE;
}
if (!mediaVerify())
return FALSE;
return TRUE;
}
@ -153,6 +151,8 @@ int
installCommit(char *str)
{
installInitial();
if (!mediaVerify())
return 0;
distExtractAll();
installFinal();
return 0;

5
usr.sbin/sysinstall/media.c
View file

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: media.c,v 1.9 1995/05/20 10:33:06 jkh Exp $
* $Id: media.c,v 1.10 1995/05/20 11:10:33 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -218,9 +218,6 @@ mediaOpen(char *parent, char *me)
{
char fname[FILENAME_MAX];
if (!mediaVerify())
return NULL;
if (parent)
snprintf(fname, FILENAME_MAX, "%s%s", parent, me);
else