[syslinux:elflink] ldlinux: Fix build warnings caused by refstrdup () usage

syslinux-bot for Matt Fleming matt.fleming at intel.com
Tue Apr 17 11:24:14 PDT 2012


Commit-ID:  7b6d2e3f03bbf974975cfe184c67b686233166b2
Gitweb:     http://www.syslinux.org/commit/7b6d2e3f03bbf974975cfe184c67b686233166b2
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Mon, 2 Apr 2012 14:26:22 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Tue, 17 Apr 2012 10:58:34 +0100

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 at intel.com>

---
 com32/elflink/ldlinux/readconfig.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index 4f7a4d2..61f9552 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));


More information about the Syslinux-commits mailing list