From 8b336c283088032e53a2c0f557276d1cef6d2649 Mon Sep 17 00:00:00 2001 From: "shingil.kang" Date: Mon, 16 Nov 2015 21:05:24 +0900 Subject: [PATCH] Fixes for issues reported by Static Code Analysis - Variable atomicity - Bad sizeof usage Change-Id: I07f780ad12be2e74176965cabaa1a810ef0893da Signed-off-by: shingil.kang --- src/transport.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/transport.c b/src/transport.c index e63e5d6..c4b64d7 100644 --- a/src/transport.c +++ b/src/transport.c @@ -170,7 +170,7 @@ static int write_packet(int fd, const char* name, apacket** ppacket) { char *p = (char*) ppacket; /* we really write the packet address */ - int r, len = sizeof(ppacket); + int r, len = sizeof(apacket*); char buff[8]; if (!name) { snprintf(buff, sizeof buff, "fd=%d", fd); @@ -182,7 +182,6 @@ write_packet(int fd, const char* name, apacket** ppacket) dump_packet(name, "to remote", *ppacket); } #endif - len = sizeof(ppacket); while(len > 0) { r = sdb_write(fd, p, len); if(r > 0) { @@ -748,7 +747,6 @@ atransport *acquire_one_transport(int state, transport_type ttype, const char* s atransport *result = NULL; int ambiguous = 0; -retry: if (error_out) *error_out = "device not found"; @@ -797,7 +795,6 @@ retry: } } } - sdb_mutex_unlock(&transport_lock); if (result) { /* offline devices are ignored -- they are either being born or dying */ @@ -818,11 +815,9 @@ retry: /* found one that we can take */ if (error_out) *error_out = NULL; - } else if (state != CS_ANY && (serial || !ambiguous)) { - sdb_sleep_ms(1000); - goto retry; } + sdb_mutex_unlock(&transport_lock); return result; } -- 2.7.4