aboutsummaryrefslogtreecommitdiffstats
path: root/com32/menu
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-02-10 22:35:00 -0800
committerH. Peter Anvin <hpa@zytor.com>2008-02-10 22:35:00 -0800
commitf3d1ed326f69a4e2f1475ca77d8854eba18a43e3 (patch)
tree2062aae0fe918dc1bec4a801cd01f573a81bb724 /com32/menu
parent4d4bf8c86bc16a9b75449054ce78c0ac097c86d5 (diff)
downloadsyslinux-f3d1ed326f69a4e2f1475ca77d8854eba18a43e3.tar.gz
syslinux-f3d1ed326f69a4e2f1475ca77d8854eba18a43e3.tar.xz
syslinux-f3d1ed326f69a4e2f1475ca77d8854eba18a43e3.zip
simple menu: update copyright notices; clean whitespace
Diffstat (limited to 'com32/menu')
-rw-r--r--com32/menu/Makefile4
-rw-r--r--com32/menu/menu.c4
-rw-r--r--com32/menu/menu.h4
-rw-r--r--com32/menu/menumain.c2
-rw-r--r--com32/menu/passwd.c3
-rw-r--r--com32/menu/printmsg.c12
-rw-r--r--com32/menu/readconfig.c8
-rw-r--r--com32/menu/vesamenu.c4
8 files changed, 26 insertions, 15 deletions
diff --git a/com32/menu/Makefile b/com32/menu/Makefile
index 8d615ce2..409b032e 100644
--- a/com32/menu/Makefile
+++ b/com32/menu/Makefile
@@ -4,8 +4,8 @@
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, Inc., 53 Temple Place Ste 330,
-## Boston MA 02111-1307, USA; either version 2 of the License, or
+## the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+## Boston MA 02110-1301, USA; either version 2 of the License, or
## (at your option) any later version; incorporated herein by reference.
##
## -----------------------------------------------------------------------
diff --git a/com32/menu/menu.c b/com32/menu/menu.c
index 951048d7..9a6ad895 100644
--- a/com32/menu/menu.c
+++ b/com32/menu/menu.c
@@ -4,8 +4,8 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, Inc., 53 Temple Place Ste 330,
- * Boston MA 02111-1307, USA; either version 2 of the License, or
+ * the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston MA 02110-1301, USA; either version 2 of the License, or
* (at your option) any later version; incorporated herein by reference.
*
* ----------------------------------------------------------------------- */
diff --git a/com32/menu/menu.h b/com32/menu/menu.h
index bf376aae..122a09d2 100644
--- a/com32/menu/menu.h
+++ b/com32/menu/menu.h
@@ -4,8 +4,8 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, Inc., 53 Temple Place Ste 330,
- * Boston MA 02111-1307, USA; either version 2 of the License, or
+ * the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston MA 02110-1301, USA; either version 2 of the License, or
* (at your option) any later version; incorporated herein by reference.
*
* ----------------------------------------------------------------------- */
diff --git a/com32/menu/menumain.c b/com32/menu/menumain.c
index 2296e7ad..3a5d712d 100644
--- a/com32/menu/menumain.c
+++ b/com32/menu/menumain.c
@@ -1,5 +1,5 @@
/* ----------------------------------------------------------------------- *
- *
+ *
* Copyright 2004-2008 H. Peter Anvin - All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
diff --git a/com32/menu/passwd.c b/com32/menu/passwd.c
index 4a420246..0016a0d5 100644
--- a/com32/menu/passwd.c
+++ b/com32/menu/passwd.c
@@ -1,5 +1,5 @@
/* ----------------------------------------------------------------------- *
- *
+ *
* Copyright 2004-2008 H. Peter Anvin - All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
@@ -61,4 +61,3 @@ int passwd_compare(const char *passwd, const char *entry)
else
return 0; /* Invalid encryption algorithm */
}
-
diff --git a/com32/menu/printmsg.c b/com32/menu/printmsg.c
index 128bbc03..e07e395a 100644
--- a/com32/menu/printmsg.c
+++ b/com32/menu/printmsg.c
@@ -1,3 +1,15 @@
+/* ----------------------------------------------------------------------- *
+ *
+ * Copyright 2004-2008 H. Peter Anvin - All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston MA 02110-1301, USA; either version 2 of the License, or
+ * (at your option) any later version; incorporated herein by reference.
+ *
+ * ----------------------------------------------------------------------- */
+
#define _GNU_SOURCE /* Needed for asprintf() on Linux */
#include <ctype.h>
#include <string.h>
diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
index 5de9a7da..3995be26 100644
--- a/com32/menu/readconfig.c
+++ b/com32/menu/readconfig.c
@@ -4,8 +4,8 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, Inc., 53 Temple Place Ste 330,
- * Boston MA 02111-1307, USA; either version 2 of the License, or
+ * the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston MA 02110-1301, USA; either version 2 of the License, or
* (at your option) any later version; incorporated herein by reference.
*
* ----------------------------------------------------------------------- */
@@ -218,7 +218,7 @@ record(struct labeldata *ld, char *append)
kernel_types[ld->type], ld->kernel, s, a, ipoptions);
}
- if ( ld->menuseparator )
+ if ( ld->menuseparator )
me->displayname = "";
if ( ld->menuseparator || ld->menudisabled ) {
@@ -226,7 +226,7 @@ record(struct labeldata *ld, char *append)
me->passwd = NULL;
me->disabled = 1;
- if ( me->cmdline )
+ if ( me->cmdline )
free(me->cmdline);
me->cmdline = NULL;
diff --git a/com32/menu/vesamenu.c b/com32/menu/vesamenu.c
index 495cfb82..cebbb344 100644
--- a/com32/menu/vesamenu.c
+++ b/com32/menu/vesamenu.c
@@ -4,8 +4,8 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, Inc., 53 Temple Place Ste 330,
- * Boston MA 02111-1307, USA; either version 2 of the License, or
+ * the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston MA 02110-1301, USA; either version 2 of the License, or
* (at your option) any later version; incorporated herein by reference.
*
* ----------------------------------------------------------------------- */