1. Update all the copyrights to delete useless clauses 3 and 4.

2. Change more of the menu code over to new system.
3. Streamline label editor.

1 files changed, 3 insertions, 10 deletions

diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index 9bc4daa..60c8269 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: options.c,v 1.31 1996/03/24 12:06:13 jkh Exp $
+ * $Id: options.c,v 1.32 1996/04/07 03:52:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -19,13 +19,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Jordan Hubbard
- *	for the FreeBSD Project.
- * 4. The name of Jordan Hubbard or the FreeBSD project may not be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY JORDAN HUBBARD ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -279,12 +272,12 @@ optionsEditor(dialogMenuItem *self)
 	case 'Q':
 	    clear();
 	    dialog_clear();
-	    return RET_SUCCESS;
+	    return DITEM_SUCCESS;
 
 	default:
 	    beep();
 	}
     }
     /* NOTREACHED */
-    return RET_SUCCESS;
+    return DITEM_SUCCESS;
 }