espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-26 22:07:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

guile: Simplify ioscm_make_gdb_stdio_port

Browse Source 
As pointed out by Pedro, it's clearer to do it this way.  We can trust
that scm_mode_bits won't try to modify our string, even though it takes
a non-const char *.

gdb/ChangeLog:

	* guile/scm-ports.c (ioscm_make_gdb_stdio_port): Do not pass a
	local char array to scm_mode_bits, use a cast instead.
This commit is contained in:
Simon Marchi
2015-10-26 15:05:50 -04:00
committed by Simon Marchi
parent 7acd011bef
commit 1522597b05
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2015-10-26 Simon Marchi <simon.marchi@polymtl.ca>
* guile/scm-ports.c (ioscm_make_gdb_stdio_port): Do not pass a
local char array to scm_mode_bits, use a cast instead.
2015-10-26 Simon Marchi <simon.marchi@ericsson.com> 2015-10-26 Simon Marchi <simon.marchi@ericsson.com>
* tui/tui-data.c (tui_alloc_content): Don't check xmalloc * tui/tui-data.c (tui_alloc_content): Don't check xmalloc

17
gdb/guile/scm-ports.c
View File

@ -357,36 +357,31 @@ ioscm_init_stdio_buffers (SCM port, long mode_bits)
static SCM static SCM
ioscm_make_gdb_stdio_port (int fd) ioscm_make_gdb_stdio_port (int fd)
{ {
int is_a_tty = isatty (fd);
const char *name; const char *name;
const char *mode_str;
long mode_bits; long mode_bits;
SCM port; SCM port;
char buf[3];
memset (buf, 0, sizeof (buf));
switch (fd) switch (fd)
{ {
case 0: case 0:
name = input_port_name; name = input_port_name;
buf[0] = 'r'; mode_str = is_a_tty ? "r0" : "r";
break; break;
case 1: case 1:
name = output_port_name; name = output_port_name;
buf[0] = 'w'; mode_str = is_a_tty ? "w0" : "w";
break; break;
case 2: case 2:
name = error_port_name; name = error_port_name;
buf[0] = 'w'; mode_str = is_a_tty ? "w0" : "w";
break; break;
default: default:
gdb_assert_not_reached ("bad stdio file descriptor"); gdb_assert_not_reached ("bad stdio file descriptor");
} }
if (isatty (fd)) mode_bits = scm_mode_bits ((char *) mode_str);
buf[1] = '0';
mode_bits = scm_mode_bits (buf);
port = ioscm_open_port (stdio_port_desc, mode_bits); port = ioscm_open_port (stdio_port_desc, mode_bits);
scm_set_port_filename_x (port, gdbscm_scm_from_c_string (name)); scm_set_port_filename_x (port, gdbscm_scm_from_c_string (name));