FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* ser-mingw.c (pipe_windows_open)

Browse source 
(pipe_windows_read, pipe_windows_write): Declare
        variables at the top of the function.
This commit is contained in:
Vladimir Prus 2007-01-30 09:12:43 +00:00
parent 9a3372409b
commit ef7723ebe7
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2006-01-30 Vladimir Prus <vladimir@codesourcery.com>
* ser-mingw.c (pipe_windows_open)
(pipe_windows_read, pipe_windows_write): Declare
variables at the top of the function.
2007-01-29 Daniel Jacobowitz <dan@codesourcery.com> 2007-01-29 Daniel Jacobowitz <dan@codesourcery.com>
* doublest.c (floatformat_from_length): Use the right element from * doublest.c (floatformat_from_length): Use the right element from

19
gdb/ser-mingw.c
View file

@ -696,12 +696,15 @@ cleanup_pipe_state (void *untyped)
static int static int
pipe_windows_open (struct serial *scb, const char *name) pipe_windows_open (struct serial *scb, const char *name)
{ {
struct pipe_state *ps;
char **argv = buildargv (name); char **argv = buildargv (name);
struct cleanup *back_to = make_cleanup_freeargv (argv); struct cleanup *back_to = make_cleanup_freeargv (argv);
if (! argv[0] || argv[0][0] == '\0') if (! argv[0] || argv[0][0] == '\0')
error ("missing child command"); error ("missing child command");
struct pipe_state *ps = make_pipe_state ();
ps = make_pipe_state ();
make_cleanup (cleanup_pipe_state, ps); make_cleanup (cleanup_pipe_state, ps);
ps->pex = pex_init (PEX_USE_PIPES, "target remote pipe", NULL); ps->pex = pex_init (PEX_USE_PIPES, "target remote pipe", NULL);
@ -765,18 +768,20 @@ pipe_windows_close (struct serial *scb)
static int static int
pipe_windows_read (struct serial *scb, size_t count) pipe_windows_read (struct serial *scb, size_t count)
{ {
HANDLE pipeline_out = (HANDLE) _get_osfhandle (scb->fd); HANDLE pipeline_out;
DWORD available;
DWORD bytes_read;
pipeline_out = (HANDLE) _get_osfhandle (scb->fd);
if (pipeline_out == INVALID_HANDLE_VALUE) if (pipeline_out == INVALID_HANDLE_VALUE)
return -1; return -1;
DWORD available;
if (! PeekNamedPipe (pipeline_out, NULL, 0, NULL, &available, NULL)) if (! PeekNamedPipe (pipeline_out, NULL, 0, NULL, &available, NULL))
return -1; return -1;
if (count > available) if (count > available)
count = available; count = available;
DWORD bytes_read;
if (! ReadFile (pipeline_out, scb->buf, count, &bytes_read, NULL)) if (! ReadFile (pipeline_out, scb->buf, count, &bytes_read, NULL))
return -1; return -1;
@ -788,15 +793,17 @@ static int
pipe_windows_write (struct serial *scb, const void *buf, size_t count) pipe_windows_write (struct serial *scb, const void *buf, size_t count)
{ {
struct pipe_state *ps = scb->state; struct pipe_state *ps = scb->state;
HANDLE pipeline_in;
DWORD written;
int pipeline_in_fd = fileno (ps->input); int pipeline_in_fd = fileno (ps->input);
if (pipeline_in_fd < 0) if (pipeline_in_fd < 0)
return -1; return -1;
HANDLE pipeline_in = (HANDLE) _get_osfhandle (pipeline_in_fd); pipeline_in = (HANDLE) _get_osfhandle (pipeline_in_fd);
if (pipeline_in == INVALID_HANDLE_VALUE) if (pipeline_in == INVALID_HANDLE_VALUE)
return -1; return -1;
DWORD written;
if (! WriteFile (pipeline_in, buf, count, &written, NULL)) if (! WriteFile (pipeline_in, buf, count, &written, NULL))
return -1; return -1;