aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-04-02 14:26:22 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-04-17 10:58:34 +0100
commit7b6d2e3f03bbf974975cfe184c67b686233166b2 (patch)
tree033cdeb9e535a38e1e5ab1f236981f3794f9ebad
parent55891f97921b5e949f1bd1f2983cb964b80028c5 (diff)
downloadsyslinux-7b6d2e3f03bbf974975cfe184c67b686233166b2.tar.gz
syslinux-7b6d2e3f03bbf974975cfe184c67b686233166b2.tar.xz
syslinux-7b6d2e3f03bbf974975cfe184c67b686233166b2.zip
ldlinux: Fix build warnings caused by refstrdup() usage
Sprinkle 'const' qualifiers when dealing with refstrdup() to fix the following warnings, readconfig.c: In function ‘parse_config_file’: readconfig.c:1127:12: warning: assignment discards qualifiers from pointer target type readconfig.c:1139:12: warning: assignment discards qualifiers from pointer target type readconfig.c:1152:12: warning: assignment discards qualifiers from pointer target type readconfig.c:1315:12: warning: assignment discards qualifiers from pointer target type Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--com32/elflink/ldlinux/readconfig.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index 4f7a4d22..61f95522 100644
--- a/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@ -1121,7 +1121,8 @@ do_include:
* display/font/kbdmap are rather similar, open a file then do sth
*/
else if (looking_at(p, "display")) {
- char *filename, *dst = KernelName;
+ const char *filename;
+ char *dst = KernelName;
size_t len = FILENAME_MAX - 1;
filename = refstrdup(skipspace(p + 7));
@@ -1133,7 +1134,8 @@ do_include:
get_msg_file(KernelName);
refstr_put(filename);
} else if (looking_at(p, "font")) {
- char *filename, *dst = KernelName;
+ const char *filename;
+ char *dst = KernelName;
size_t len = FILENAME_MAX - 1;
filename = refstrdup(skipspace(p + 4));
@@ -1146,7 +1148,8 @@ do_include:
refstr_put(filename);
} else if (looking_at(p, "kbdmap")) {
com32sys_t reg;
- char *filename, *dst = KernelName;
+ const char *filename;
+ char *dst = KernelName;
size_t len = FILENAME_MAX - 1;
filename = refstrdup(skipspace(p + 4));
@@ -1309,7 +1312,8 @@ do_include:
eprintf("%s\n", p+4);
} else if (looking_at(p, "path")) {
/* PATH-based lookup */
- char *new_path, *_p;
+ const char *new_path;
+ char *_p;
size_t len, new_len;
new_path = refstrdup(skipspace(p + 4));