3 files changed, 16 insertions, 6 deletions
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index d7aadd0..699e9e8 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,13 @@
+2010-05-26  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* 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  <vapier@gentoo.org>
 
 	* devices.c (device_error): Add const to message.
diff --git a/sim/cris/dv-rv.c b/sim/cris/dv-rv.c
index bdc6f2e..45ef79d 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 edcd8d2..c716b8d 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));