Work on char* vs const char *.

6 files changed, 20 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index a299e156..2dda7b73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Dec 19 16:43:14 2010  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* awk.h (update_PROCINFO_str, update_PROCINFO_num, make_str_node):
+	Change `char *' parameters to `const char *' to avoid some
+	compiler warnings.
+	* ext.c (do_ext): Remove cast in call to make_string.
+	* field.c (update_PROCINFO_str, update_PROCINFO_num): Adjust. 
+	* main.c (init_args): Remove casts in calls to make_string.
+	* node.c (r_make_str_node): Add cast in assignment if ALREADY_MALLOCED.
+
 Sat Dec 18 20:12:59 2010  Eli Zaretskii  <eliz@gnu.org>
 
 	* array.c, gawkmisc.c, io.c, main.c, regex_internal.h,
diff --git a/awk.h b/awk.h
index 9721fdfd..43a1bcdd 100644
--- a/awk.h
+++ b/awk.h
@@ -1236,8 +1236,8 @@ extern void set_FS(void);
 extern void set_RS(void);
 extern void set_FIELDWIDTHS(void);
 extern void set_FPAT(void);
-extern void update_PROCINFO_str(char *subscript, char *str);
-extern void update_PROCINFO_num(char *subscript, AWKNUM val);
+extern void update_PROCINFO_str(const char *subscript, const char *str);
+extern void update_PROCINFO_num(const char *subscript, AWKNUM val);
 
 typedef enum {
 	Using_FS,
@@ -1311,7 +1311,7 @@ extern NODE *format_val(const char *format, int index, NODE *s);
 extern NODE *r_force_string(NODE *s);
 extern NODE *dupnode(NODE *n);
 extern NODE *mk_number(AWKNUM x, unsigned int flags);
-extern NODE *r_make_str_node(char *s, unsigned long len, int scan);
+extern NODE *r_make_str_node(const char *s, unsigned long len, int scan);
 extern NODE *more_nodes(void);
 extern void unref(NODE *tmp);
 extern int parse_escape(const char **string_ptr);
diff --git a/ext.c b/ext.c
index aeacaff5..f6d84205 100644
--- a/ext.c
+++ b/ext.c
@@ -299,7 +299,7 @@ do_ext(int nargs)
 	const char *emsg = _("Operation Not Supported");
 
 	unref(ERRNO_node->var_value);
-	ERRNO_node->var_value = make_string((char *) emsg, strlen(emsg));
+	ERRNO_node->var_value = make_string(emsg, strlen(emsg));
 	return make_number((AWKNUM) -1);
 }
 #endif
diff --git a/field.c b/field.c
index a0074d8a..97d59d91 100644
--- a/field.c
+++ b/field.c
@@ -1297,7 +1297,7 @@ current_field_sep()
 /* update_PROCINFO_str --- update PROCINFO[sub] with string value */
 
 void
-update_PROCINFO_str(char *subscript, char *str)
+update_PROCINFO_str(const char *subscript, const char *str)
 {
 	NODE **aptr;
 	NODE *tmp;
@@ -1314,7 +1314,7 @@ update_PROCINFO_str(char *subscript, char *str)
 /* update_PROCINFO_num --- update PROCINFO[sub] with numeric value */
 
 void
-update_PROCINFO_num(char *subscript, AWKNUM val)
+update_PROCINFO_num(const char *subscript, AWKNUM val)
 {
 	NODE **aptr;
 	NODE *tmp;
diff --git a/main.c b/main.c
index 7e2e0e48..a3688c91 100644
--- a/main.c
+++ b/main.c
@@ -895,7 +895,7 @@ init_args(int argc0, int argc, const char *argv0, char **argv)
 	aptr = assoc_lookup(ARGV_node, tmp, FALSE);
 	unref(tmp);
 	unref(*aptr);
-	*aptr = make_string((char *) argv0, strlen(argv0));
+	*aptr = make_string(argv0, strlen(argv0));
 	(*aptr)->flags |= MAYBE_NUM;
 	for (i = argc0, j = 1; i < argc; i++) {
 		tmp = make_number((AWKNUM) j);
@@ -974,7 +974,7 @@ init_vars()
 		if ((vp->flags & NO_INSTALL) != 0)
 			continue;
 		n = mk_symbol(Node_var, vp->strval == NULL ? make_number(vp->numval)
-							: make_string((char *) vp->strval, strlen(vp->strval)));
+							: make_string(vp->strval, strlen(vp->strval)));
 		n->var_assign = (Func_ptr) vp->assign;
 		n->var_update = (Func_ptr) vp->update;
 
diff --git a/node.c b/node.c
index 820a3442..7a926f3d 100644
--- a/node.c
+++ b/node.c
@@ -342,7 +342,7 @@ mk_number(AWKNUM x, unsigned int flags)
 /* make_str_node --- make a string node */
 
 NODE *
-r_make_str_node(char *s, unsigned long len, int flags)
+r_make_str_node(const char *s, unsigned long len, int flags)
 {
 	NODE *r;
 	getnode(r);
@@ -355,7 +355,7 @@ r_make_str_node(char *s, unsigned long len, int flags)
 #endif /* defined MBS_SUPPORT */
 
 	if (flags & ALREADY_MALLOCED)
-		r->stptr = s;
+		r->stptr = (char *) s;
 	else {
 		emalloc(r->stptr, char *, len + 2, "make_str_node");
 		memcpy(r->stptr, s, len);