From 363a6e9f2c3fe1e25f8fa986347948897f189f39 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Wed, 26 May 2010 22:40:24 +0000 Subject: [PATCH] 2010-05-26 Ozkan Sezer gdb/ * ser-tcp.c (net_open): Check error return from socket() call by its equality to -1 not by it being negative. (net_close): Likewise. gdb/gdbserver/ * gdbreplay.c (remote_open): Check error return from socket() call by its equality to -1 not by it being negative. * remote-utils.c (remote_open): Likewise. sim/arm/ * communicate.c (MYread_char): Check error return from accept() call by its equality to -1 not by it being negative. (MYread_charwait): Likewise. * main.c (main): Likewise for both socket() and accept() calls. sim/common/ * dv-sockser.c (dv_sockser_init): Check error return from socket() call by its equality to -1 not by it being negative. (connected_p): Likewise for accept() call. sim/cris/ * dv-rv.c (hw_rv_init_socket): Check error return from socket() call by its equality to -1 not by it being negative. (hw_rv_write): Likewise. (hw_rv_handle_incoming): Likewise. (hw_rv_poll_once): Likewise. * rvdummy.c (setupsocket): Likewise. (main): Likewise for accept() call as returned from setupsocket(). sim/m32c/ * main.c (setup_tcp_console): Check error return from socket() call by its equality to -1 not by it being negative. --- gdb/ChangeLog | 6 ++++++ gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/gdbreplay.c | 2 +- gdb/gdbserver/remote-utils.c | 2 +- gdb/ser-tcp.c | 4 ++-- sim/arm/ChangeLog | 7 +++++++ sim/arm/communicate.c | 4 ++-- sim/arm/main.c | 4 ++-- sim/common/ChangeLog | 6 ++++++ sim/common/dv-sockser.c | 4 ++-- sim/cris/ChangeLog | 10 ++++++++++ sim/cris/dv-rv.c | 8 ++++---- sim/cris/rvdummy.c | 4 ++-- sim/m32c/ChangeLog | 5 +++++ sim/m32c/main.c | 2 +- 15 files changed, 57 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a878f01c33..50a41c0547 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2010-05-26 Ozkan Sezer + + * ser-tcp.c (net_open): Check error return from socket() call by its + equality to -1 not by it being negative. + (net_close): Likewise. + 2010-05-26 Pedro Alves * NEWS: Mention the `qRelocInsn' feature. diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index d8a3c508d6..e9c960e9eb 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2010-05-26 Ozkan Sezer + + * gdbreplay.c (remote_open): Check error return from socket() call by + its equality to -1 not by it being negative. + * remote-utils.c (remote_open): Likewise. + 2010-05-23 Pedro Alves * config.h: Regenerate. diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c index a128413c47..3ae805193d 100644 --- a/gdb/gdbserver/gdbreplay.c +++ b/gdb/gdbserver/gdbreplay.c @@ -210,7 +210,7 @@ remote_open (char *name) #endif tmp_desc = socket (PF_INET, SOCK_STREAM, 0); - if (tmp_desc < 0) + if (tmp_desc == -1) perror_with_name ("Can't open socket"); /* Allow rapid reuse of this port. */ diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index 64106592de..164ce6a853 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -305,7 +305,7 @@ remote_open (char *name) #endif listen_desc = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (listen_desc < 0) + if (listen_desc == -1) perror_with_name ("Can't open socket"); /* Allow rapid reuse of this port. */ diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c index dd685e6934..cb862e7e55 100644 --- a/gdb/ser-tcp.c +++ b/gdb/ser-tcp.c @@ -209,7 +209,7 @@ net_open (struct serial *scb, const char *name) else scb->fd = socket (PF_INET, SOCK_STREAM, 0); - if (scb->fd < 0) + if (scb->fd == -1) return -1; /* set socket nonblocking */ @@ -325,7 +325,7 @@ net_open (struct serial *scb, const char *name) void net_close (struct serial *scb) { - if (scb->fd < 0) + if (scb->fd == -1) return; close (scb->fd); diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 192f07e573..1e0714461b 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,10 @@ +2010-05-26 Ozkan Sezer + + * communicate.c (MYread_char): Check error return from accept() call + by its equality to -1 not by it being negative. + (MYread_charwait): Likewise. + * main.c (main): Likewise for both socket() and accept() calls. + 2010-04-14 Mike Frysinger * wrapper.c (sim_write): Add const to buffer arg. diff --git a/sim/arm/communicate.c b/sim/arm/communicate.c index 2fabbaaac5..fac2b60244 100644 --- a/sim/arm/communicate.c +++ b/sim/arm/communicate.c @@ -83,7 +83,7 @@ retry: return -1; fprintf (stderr, "Waiting for connection from debugger..."); debugsock = accept (sockethandle, &isa, &i); - if (debugsock < 0) + if (debugsock == -1) { /* Now we are in serious trouble... */ perror ("accept"); return -1; @@ -138,7 +138,7 @@ retry: return -1; fprintf (stderr, "Waiting for connection from debugger..."); debugsock = accept (sockethandle, &isa, &i); - if (debugsock < 0) + if (debugsock == -1) { /* Now we are in serious trouble... */ perror ("accept"); return -1; diff --git a/sim/arm/main.c b/sim/arm/main.c index 1841ae49b6..9bc20fef23 100644 --- a/sim/arm/main.c +++ b/sim/arm/main.c @@ -117,7 +117,7 @@ main (int argc, char *argv[]) /* Open a socket */ sockethandle = socket (hp->h_addrtype, SOCK_STREAM, 0); - if (sockethandle < 0) + if (sockethandle == -1) { perror ("socket"); return 1; @@ -147,7 +147,7 @@ main (int argc, char *argv[]) fprintf (stderr, "Waiting for connection from debugger..."); debugsock = accept (sockethandle, &isa, &i); - if (debugsock < 0) + if (debugsock == -1) { perror ("accept"); return 1; diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 3aa491a318..2eebba82b9 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,9 @@ +2010-05-26 Ozkan Sezer + + * dv-sockser.c (dv_sockser_init): Check error return from socket() + call by its equality to -1 not by it being negative. + (connected_p): Likewise for accept() call. + 2010-04-23 Mike Frysinger * sim-fpu.c (sim_fpu_zero, sim_fpu_qnan): Add 0 initializers. diff --git a/sim/common/dv-sockser.c b/sim/common/dv-sockser.c index a8626cda52..b09d9c94d2 100644 --- a/sim/common/dv-sockser.c +++ b/sim/common/dv-sockser.c @@ -166,7 +166,7 @@ dv_sockser_init (SIM_DESC sd) } sockser_listen_fd = socket (PF_INET, SOCK_STREAM, 0); - if (sockser_listen_fd < 0) + if (sockser_listen_fd == -1) { sim_io_eprintf (sd, "sockser init: unable to get socket: %s\n", strerror (errno)); @@ -274,7 +274,7 @@ connected_p (SIM_DESC sd) addrlen = sizeof (sockaddr); sockser_fd = accept (sockser_listen_fd, &sockaddr, &addrlen); - if (sockser_fd < 0) + if (sockser_fd == -1) return 0; /* Set non-blocking i/o. */ diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index d7aadd0a13..699e9e8fac 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,13 @@ +2010-05-26 Ozkan Sezer + + * dv-rv.c (hw_rv_init_socket): Check error return from socket() call + by its equality to -1 not by it being negative. + (hw_rv_write): Likewise. + (hw_rv_handle_incoming): Likewise. + (hw_rv_poll_once): Likewise. + * rvdummy.c (setupsocket): Likewise. + (main): Likewise for accept() call as returned from setupsocket(). + 2010-03-30 Mike Frysinger * devices.c (device_error): Add const to message. diff --git a/sim/cris/dv-rv.c b/sim/cris/dv-rv.c index bdc6f2ef47..45ef79d7b6 100644 --- a/sim/cris/dv-rv.c +++ b/sim/cris/dv-rv.c @@ -404,7 +404,7 @@ hw_rv_write (struct hw *me, /* If we don't have a valid fd here, it's because we got an error initially, and we suppressed that error. */ - if (rv->fd < 0) + if (rv->fd == -1) hw_abort (me, "couldn't open a connection to %s:%d because: %s", rv->host, rv->port, strerror (rv->saved_errno)); @@ -637,7 +637,7 @@ hw_rv_handle_incoming (struct hw *me, { hw_rv_read (me, cbuf, 3); - if (rv->fd < 0) + if (rv->fd == -1) return; len = cbuf[0] + cbuf[1] * 256 - 3; @@ -723,7 +723,7 @@ hw_rv_poll_once (struct hw *me) int ret; struct timeval tv; - if (rv->fd < 0) + if (rv->fd == -1) /* Connection has died or was never initiated. */ return; @@ -887,7 +887,7 @@ hw_rv_init_socket (struct hw *me) server.sin_port = htons (rv->port); sock = socket (AF_INET, SOCK_STREAM, 0); - if (sock < 0) + if (sock == -1) hw_abort (me, "can't get a socket for %s:%d connection", rv->host, rv->port); diff --git a/sim/cris/rvdummy.c b/sim/cris/rvdummy.c index edcd8d2003..c716b8db7e 100644 --- a/sim/cris/rvdummy.c +++ b/sim/cris/rvdummy.c @@ -118,7 +118,7 @@ int setupsocket (void) memset (&sa_in, 0, sizeof (sa_in)); s = socket (AF_INET, SOCK_STREAM, 0); - if (s < 0) + if (s == -1) return -1; if (setsockopt (s, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof reuse) != 0) @@ -517,7 +517,7 @@ main (int argc, char *argv[]) } fd = setupsocket (); - if (fd < 0) + if (fd == -1) { fprintf (stderr, "%s: problem setting up the connection: %s\n", progname, strerror (errno)); diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index 982793734d..49dfa03a52 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,3 +1,8 @@ +2010-05-26 Ozkan Sezer + + * main.c (setup_tcp_console): Check error return from socket() call + by its equality to -1 not by it being negative. + 2010-04-14 Mike Frysinger * gdb-if.c (sim_write): Add const to buf arg. diff --git a/sim/m32c/main.c b/sim/m32c/main.c index 589a6005f3..2f31242fbd 100644 --- a/sim/m32c/main.c +++ b/sim/m32c/main.c @@ -98,7 +98,7 @@ setup_tcp_console (char *portname) address.sin_port = htons (port); isocket = socket (AF_INET, SOCK_STREAM, 0); - if (isocket < 0) + if (isocket == -1) { perror ("socket"); exit (1); -- 2.34.1