1. Make this compile again after Poul's changes to the get() strategy

   routine.

2. Improve the tcpip menu slightly.

5 files changed, 10 insertions, 10 deletions

diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c
index cdf0574..2e2e54f 100644
--- a/release/sysinstall/devices.c
+++ b/release/sysinstall/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: devices.c,v 1.30 1995/05/24 17:49:11 jkh Exp $
+ * $Id: devices.c,v 1.31 1995/05/26 08:41:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -145,7 +145,7 @@ deviceDiskFree(Device *dev)
 /* Register a new device in the devices array */
 Device *
 deviceRegister(char *name, char *desc, char *devname, DeviceType type, Boolean enabled,
-	       Boolean (*init)(Device *), int (*get)(char *, char *), Boolean (*close)(Device *, int),
+	       Boolean (*init)(Device *), int (*get)(char *), Boolean (*close)(Device *, int),
 	       void (*shutdown)(Device *), void *private)
 {
     Device *newdev;
diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index 7ece498..0d55801 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tcpip.c,v 1.21 1995/05/26 22:08:59 jkh Exp $
+ * $Id: tcpip.c,v 1.22 1995/05/27 23:39:34 phk Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
@@ -206,7 +206,7 @@ tcpOpenDialog(Device *devp)
     /* Setup a nice screen for us to splat stuff onto */
     draw_box(ds_win, TCP_DIALOG_Y, TCP_DIALOG_X, TCP_DIALOG_HEIGHT, TCP_DIALOG_WIDTH, dialog_attr, border_attr);
     wattrset(ds_win, dialog_attr);
-    mvwaddstr(ds_win, TCP_DIALOG_Y, TCP_DIALOG_X + 20, " Network Configuration ");
+    mvprintw(ds_win, TCP_DIALOG_Y, TCP_DIALOG_X + 20, " Interface %s ", devp->name);
 
     draw_box(ds_win, TCP_DIALOG_Y + 9, TCP_DIALOG_X + 8, TCP_DIALOG_HEIGHT - 13, TCP_DIALOG_WIDTH - 17,
 	     dialog_attr, border_attr);
diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c
index cdf0574..2e2e54f 100644
--- a/usr.sbin/sade/devices.c
+++ b/usr.sbin/sade/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: devices.c,v 1.30 1995/05/24 17:49:11 jkh Exp $
+ * $Id: devices.c,v 1.31 1995/05/26 08:41:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -145,7 +145,7 @@ deviceDiskFree(Device *dev)
 /* Register a new device in the devices array */
 Device *
 deviceRegister(char *name, char *desc, char *devname, DeviceType type, Boolean enabled,
-	       Boolean (*init)(Device *), int (*get)(char *, char *), Boolean (*close)(Device *, int),
+	       Boolean (*init)(Device *), int (*get)(char *), Boolean (*close)(Device *, int),
 	       void (*shutdown)(Device *), void *private)
 {
     Device *newdev;
diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c
index cdf0574..2e2e54f 100644
--- a/usr.sbin/sysinstall/devices.c
+++ b/usr.sbin/sysinstall/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: devices.c,v 1.30 1995/05/24 17:49:11 jkh Exp $
+ * $Id: devices.c,v 1.31 1995/05/26 08:41:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -145,7 +145,7 @@ deviceDiskFree(Device *dev)
 /* Register a new device in the devices array */
 Device *
 deviceRegister(char *name, char *desc, char *devname, DeviceType type, Boolean enabled,
-	       Boolean (*init)(Device *), int (*get)(char *, char *), Boolean (*close)(Device *, int),
+	       Boolean (*init)(Device *), int (*get)(char *), Boolean (*close)(Device *, int),
 	       void (*shutdown)(Device *), void *private)
 {
     Device *newdev;
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c
index 7ece498..0d55801 100644
--- a/usr.sbin/sysinstall/tcpip.c
+++ b/usr.sbin/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tcpip.c,v 1.21 1995/05/26 22:08:59 jkh Exp $
+ * $Id: tcpip.c,v 1.22 1995/05/27 23:39:34 phk Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
@@ -206,7 +206,7 @@ tcpOpenDialog(Device *devp)
     /* Setup a nice screen for us to splat stuff onto */
     draw_box(ds_win, TCP_DIALOG_Y, TCP_DIALOG_X, TCP_DIALOG_HEIGHT, TCP_DIALOG_WIDTH, dialog_attr, border_attr);
     wattrset(ds_win, dialog_attr);
-    mvwaddstr(ds_win, TCP_DIALOG_Y, TCP_DIALOG_X + 20, " Network Configuration ");
+    mvprintw(ds_win, TCP_DIALOG_Y, TCP_DIALOG_X + 20, " Interface %s ", devp->name);
 
     draw_box(ds_win, TCP_DIALOG_Y + 9, TCP_DIALOG_X + 8, TCP_DIALOG_HEIGHT - 13, TCP_DIALOG_WIDTH - 17,
 	     dialog_attr, border_attr);