Commit 2e384318 by Fred Fish Committed by Jim Wilson

From Fred Fish, fix BeOS (I assume) related problem with mixing char pointers.

	* cpplib.c (quote_string): Cast first arg of sprintf call
	from "unsigned char *" to "char *".
	(output_line_command): Ditto.
	(macroexpand): Ditto.
	(do_line): Cast atoi arg from "unsigned char *" to "char *".

From-SVN: r15418
parent ac64120e
Thu Sep 11 15:48:32 1997 Fred Fish <fnf@ninemoons.com>
* cpplib.c (quote_string): Cast first arg of sprintf call
from "unsigned char *" to "char *".
(output_line_command): Ditto.
(macroexpand): Ditto.
(do_line): Cast atoi arg from "unsigned char *" to "char *".
Wed Sep 10 21:37:30 1997 Jeffrey A Law (law@cygnus.com) Wed Sep 10 21:37:30 1997 Jeffrey A Law (law@cygnus.com)
* version.c: Bump for snapshot. * version.c: Bump for snapshot.
......
...@@ -510,7 +510,7 @@ quote_string (pfile, src) ...@@ -510,7 +510,7 @@ quote_string (pfile, src)
CPP_PUTC_Q (pfile, c); CPP_PUTC_Q (pfile, c);
else else
{ {
sprintf (CPP_PWRITTEN (pfile), "\\%03o", c); sprintf ((char *) CPP_PWRITTEN (pfile), "\\%03o", c);
CPP_ADJUST_WRITTEN (pfile, 4); CPP_ADJUST_WRITTEN (pfile, 4);
} }
break; break;
...@@ -2133,7 +2133,7 @@ output_line_command (pfile, conditional, file_change) ...@@ -2133,7 +2133,7 @@ output_line_command (pfile, conditional, file_change)
CPP_PUTS_Q (pfile, sharp_line, sizeof(sharp_line)-1); CPP_PUTS_Q (pfile, sharp_line, sizeof(sharp_line)-1);
} }
sprintf (CPP_PWRITTEN (pfile), "%d ", line); sprintf ((char *) CPP_PWRITTEN (pfile), "%d ", line);
CPP_ADJUST_WRITTEN (pfile, strlen (CPP_PWRITTEN (pfile))); CPP_ADJUST_WRITTEN (pfile, strlen (CPP_PWRITTEN (pfile)));
quote_string (pfile, ip->nominal_fname); quote_string (pfile, ip->nominal_fname);
...@@ -2809,7 +2809,7 @@ macroexpand (pfile, hp) ...@@ -2809,7 +2809,7 @@ macroexpand (pfile, hp)
else else
{ {
CPP_RESERVE (pfile, 4); CPP_RESERVE (pfile, 4);
sprintf (CPP_PWRITTEN (pfile), "\\%03o", sprintf ((char *) CPP_PWRITTEN (pfile), "\\%03o",
(unsigned int) c); (unsigned int) c);
CPP_ADJUST_WRITTEN (pfile, 4); CPP_ADJUST_WRITTEN (pfile, 4);
} }
...@@ -3728,7 +3728,7 @@ do_line (pfile, keyword) ...@@ -3728,7 +3728,7 @@ do_line (pfile, keyword)
/* The Newline at the end of this line remains to be processed. /* The Newline at the end of this line remains to be processed.
To put the next line at the specified line number, To put the next line at the specified line number,
we must store a line number now that is one less. */ we must store a line number now that is one less. */
new_lineno = atoi (pfile->token_buffer + old_written) - 1; new_lineno = atoi ((char *) pfile->token_buffer + old_written) - 1;
CPP_SET_WRITTEN (pfile, old_written); CPP_SET_WRITTEN (pfile, old_written);
/* NEW_LINENO is one less than the actual line number here. */ /* NEW_LINENO is one less than the actual line number here. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment