aboutsummaryrefslogtreecommitdiffstats
path: root/com32/elflink/ldlinux/readconfig.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2011-03-16 12:53:58 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2011-03-16 12:53:58 -0700
commit8c576f1fe03e34879921311f46613a35c6530000 (patch)
tree7eacb2c747d6778cde4e3e1a45a4c51372725e2a /com32/elflink/ldlinux/readconfig.c
parent1c5f52052c2452c159498fb1beb941d3b40d4661 (diff)
parentd8ed6505926c83a309ebc946f5795781a2392f7c (diff)
downloadsyslinux-8c576f1fe03e34879921311f46613a35c6530000.tar.gz
syslinux-8c576f1fe03e34879921311f46613a35c6530000.tar.xz
syslinux-8c576f1fe03e34879921311f46613a35c6530000.zip
Merge remote-tracking branch 'mfleming/for-hpa/elflink/fix-compiler-warnings' into elflink
Diffstat (limited to 'com32/elflink/ldlinux/readconfig.c')
-rw-r--r--com32/elflink/ldlinux/readconfig.c22
1 files changed, 4 insertions, 18 deletions
diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index 898ee19a..e13d6d47 100644
--- a/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@ -59,8 +59,8 @@ short vkernel = 0; //have we seen any "label" statements?
short displaycon = 1; //conio.inc
short nohalt = 1; //idle.inc
-char *default_cmd = NULL; //"default" command line
-char *onerror = NULL; //"onerror" command line
+const char *default_cmd = NULL; //"default" command line
+const char *onerror = NULL; //"onerror" command line
/* Empty refstring */
const char *empty_string;
@@ -75,7 +75,7 @@ long long totaltimeout = 0;
/* Keep track of global default */
static int has_ui = 0; /* DEFAULT only counts if UI is found */
-extern char *globaldefault;
+extern const char *globaldefault;
static bool menusave = false; /* True if there is any "menu save" */
/* Linked list of all entires, hidden or not; used by unlabel() */
@@ -568,7 +568,7 @@ uint32_t parse_argb(char **p)
* same way as if the files had been concatenated together.
*/
//static const char *append = NULL;
-extern char *append;
+extern const char *append;
//static unsigned int ipappend = 0;
unsigned int ipappend = 0;
static struct labeldata ld;
@@ -1056,7 +1056,6 @@ do_include:
static int parse_one_config(const char *filename)
{
FILE *f;
- int i;
/*
if (!strcmp(filename, "~"))
@@ -1107,24 +1106,11 @@ static void resolve_gotos(void)
}
}
-static void dump_menu(struct menu *menu)
-{
- dprintf("will dump menu for %s:", menu->label);
- printf("entries num: %d\n", menu->nentries);
- printf("defentry: %d, nam = %s\n",
- menu->defentry, menu->menu_entries[menu->defentry]->label);
- printf("save: %d\n", menu->save);
- //printf("", menu->);
- //printf("", menu->);
- //printf("", menu->);
-}
-
void parse_configs(char **argv)
{
const char *filename;
struct menu *m;
struct menu_entry *me;
- char *cmdline;
dprintf("enter");
empty_string = refstrdup("");