From d5ee164d03d9a0faede59c2a0fda94f2fd7b9117 Mon Sep 17 00:00:00 2001
From: Kyungwook Tak <k.tak@samsung.com>
Date: Mon, 14 Dec 2015 16:53:33 +0900
Subject: [PATCH] Fix svace defects

Change-Id: I4aeec974f1e627835a9db8a0333407f83e1f90d7
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
---
 src/common/net/http/transport_security_state.cpp | 1 +
 test/gnutls_test.cpp                             | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/common/net/http/transport_security_state.cpp b/src/common/net/http/transport_security_state.cpp
index 605b274..d3b5db5 100644
--- a/src/common/net/http/transport_security_state.cpp
+++ b/src/common/net/http/transport_security_state.cpp
@@ -44,6 +44,7 @@ class BitReader {
         num_bits_(num_bits),
         num_bytes_((num_bits + 7) / 8),
         current_byte_index_(0),
+        current_byte_(0),
         num_bits_used_(8) {}
 
   // Next sets |*out| to the next bit from the input. It returns false if no
diff --git a/test/gnutls_test.cpp b/test/gnutls_test.cpp
index 870eb40..132eafc 100644
--- a/test/gnutls_test.cpp
+++ b/test/gnutls_test.cpp
@@ -28,8 +28,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 
 #include <gnutls/gnutls.h>
 #include <tpkp_gnutls.h>
@@ -72,10 +70,8 @@ void connectWithUrl(const std::string &url, int &sockfd)
 		if (sockfd == -1)
 			continue;
 
-		if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) != -1) {
-			char *ipaddr = inet_ntoa(*((struct in_addr *)rp->ai_addr));
+		if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) != -1)
 			break;
-		}
 
 		close(sockfd);
 	}
@@ -196,7 +192,8 @@ void performHandshake(DataSet &data)
 void cleanup(DataSet &data)
 {
 	gnutls_bye(data.session, GNUTLS_SHUT_RDWR);
-	close(data.sockfd);
+	if (data.sockfd > 0)
+		close(data.sockfd);
 	gnutls_certificate_free_credentials(data.cred);
 	gnutls_deinit(data.session);
 
-- 
2.7.4