From 2c619be216c9fb729c2696fa10957732290b041a Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 26 Mar 2013 20:29:47 +0000 Subject: [PATCH] ser-tcp.c: Small signed->unsigned cleanup. The "set tcp connect-timeout" variable is unsigned: /* Timeout period for connections, in seconds. */ static unsigned int tcp_retry_limit = 15; And used like: /* Check for timeout. */ if (*polls > tcp_retry_limit * POLL_INTERVAL) { errno = ETIMEDOUT; return -1; } Which made me stop and look over why is it that 'polls' is signed. What I found is there's really no reason. gdb/ 2013-03-26 Pedro Alves * ser-tcp.c (wait_for_connect): Make 'polls' parameter unsigned. (net_open): Make 'polls' local unsigned. --- gdb/ChangeLog | 5 +++++ gdb/ser-tcp.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index eef0a2535b7..cc307547d8f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2013-03-26 Pedro Alves + + * ser-tcp.c (wait_for_connect): Make 'polls' parameter unsigned. + (net_open): Make 'polls' local unsigned. + 2013-03-26 Pedro Alves * remote.c (_initialize_remote): Make "set remoteaddresssize" diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c index 34c6af1f316..a818c657cae 100644 --- a/gdb/ser-tcp.c +++ b/gdb/ser-tcp.c @@ -83,7 +83,7 @@ static unsigned int tcp_retry_limit = 15; Returns -1 on timeout or interrupt, otherwise the value of select. */ static int -wait_for_connect (struct serial *scb, int *polls) +wait_for_connect (struct serial *scb, unsigned int *polls) { struct timeval t; int n; @@ -165,7 +165,7 @@ net_open (struct serial *scb, const char *name) #else int ioarg; #endif - int polls = 0; + unsigned int polls = 0; use_udp = 0; if (strncmp (name, "udp:", 4) == 0) -- 2.30.2