* src/SDCCval.c: fixed bug introduced by me in rev. #4577

[fw/sdcc] / src / SDCCval.c

diff --git a/src/SDCCval.c b/src/SDCCval.c
index e0821e1e45129eba22c1d4b2c1979665437b8e71..575d0e927edbd4b329272eae81d9c8f2554e6033 100644 (file)
--- a/src/SDCCval.c
+++ b/src/SDCCval.c
@@ -57,8 +57,8 @@ newiList (int type, void *ilist)
   nilist = Safe_alloc (sizeof (initList));
 
   nilist->type = type;
-  nilist->lineno = mylineno;
-  nilist->filename = currFname;
+  nilist->lineno = lineno;
+  nilist->filename = filename;
 
   switch (type)
     {
@@ -686,7 +686,7 @@ constFixed16x16Val (char *s)
 /*-----------------------------------------------------------------*/
 /* constVal - converts an INTEGER constant into a cheapest value   */
 /*-----------------------------------------------------------------*/
-value *constVal (char *s)
+value *constVal (const char *s)
 {
   value *val;
   short hex = 0, octal = 0;
@@ -810,15 +810,14 @@ value *constVal (char *s)
     /param src Pointer to 'x' from start of hex character value
 */
 
-unsigned char hexEscape(char **src)
+unsigned char hexEscape(const char **src)
 {
   char *s ;
   unsigned long value ;
 
   (*src)++ ;    /* Skip over the 'x' */
-  s = *src ;    /* Save for error detection */
 
-  value = strtol (*src, src, 16);
+  value = strtol (*src, &s, 16);
 
   if (s == *src) {
       // no valid hex found
@@ -828,6 +827,8 @@ unsigned char hexEscape(char **src)
       werror(W_ESC_SEQ_OOR_FOR_CHAR);
     }
   }
+  *src = s;
+
   return (char) value;
 }
 
@@ -837,7 +838,7 @@ unsigned char hexEscape(char **src)
 /* adjust src to point at the last proccesed char                   */
 /*------------------------------------------------------------------*/
 
-unsigned char octalEscape (char **str) {
+unsigned char octalEscape (const char **str) {
   int digits;
   unsigned value=0;
 
@@ -870,7 +871,7 @@ unsigned char octalEscape (char **str) {
 */
 
 int
-copyStr (char *dest, char *src)
+copyStr (char *dest, const char *src)
 
 {
   char *OriginalDest = dest ;
@@ -953,7 +954,7 @@ copyStr (char *dest, char *src)
 /* strVal - converts a string constant to a value       */
 /*------------------------------------------------------------------*/
 value *
-strVal (char *s)
+strVal (const char *s)
 {
   value *val;
 
@@ -1063,7 +1064,7 @@ copyValue (value * src)
 /* charVal - converts a character constant to a value       */
 /*------------------------------------------------------------------*/
 value *
-charVal (char *s)
+charVal (const char *s)
 {
   value *val;