procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
This commit is contained in:
Fred Fish 1997-09-11 22:51:33 +00:00 • committed by Jim Wilson
parent ac64120eeb
commit 2e384318d3
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/ChangeLog
View file

@ -1,3 +1,11 @@
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)
* version.c: Bump for snapshot.

8
gcc/cpplib.c
View file

@ -510,7 +510,7 @@ quote_string (pfile, src)
CPP_PUTC_Q (pfile, c);
else
{
sprintf (CPP_PWRITTEN (pfile), "\\%03o", c);
sprintf ((char *) CPP_PWRITTEN (pfile), "\\%03o", c);
CPP_ADJUST_WRITTEN (pfile, 4);
}
break;
@ -2133,7 +2133,7 @@ output_line_command (pfile, conditional, file_change)
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)));
quote_string (pfile, ip->nominal_fname);
@ -2809,7 +2809,7 @@ macroexpand (pfile, hp)
else
{
CPP_RESERVE (pfile, 4);
sprintf (CPP_PWRITTEN (pfile), "\\%03o",
sprintf ((char *) CPP_PWRITTEN (pfile), "\\%03o",
(unsigned int) c);
CPP_ADJUST_WRITTEN (pfile, 4);
}
@ -3728,7 +3728,7 @@ do_line (pfile, keyword)
/* The Newline at the end of this line remains to be processed.
To put the next line at the specified line number,
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);
/* NEW_LINENO is one less than the actual line number here. */