From e7c43f6d5493322520118501a7e88aeb2fbf83a2 Mon Sep 17 00:00:00 2001
From: Adam Malinowski <a.malinowsk2@partner.samsung.com>
Date: Fri, 25 Jul 2014 11:48:43 +0200
Subject: [PATCH] Reduce scope of variables

Change-Id: Ib18cde12f9508cb17469bcef0bb38a6665d6297d
---
 src/common/sockets/Socket.cpp | 6 ++----
 src/service/main/main.cpp     | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/common/sockets/Socket.cpp b/src/common/sockets/Socket.cpp
index 5149d17..e666262 100644
--- a/src/common/sockets/Socket.cpp
+++ b/src/common/sockets/Socket.cpp
@@ -143,9 +143,8 @@ bool Socket::connect(void) {
 
     int retval = TEMP_FAILURE_RETRY(::connect(m_sock, (struct sockaddr*)&clientAddr,
                                             SUN_LEN(&clientAddr)));
-    int err = 0;
     if (retval == -1) {
-        err = errno;
+        int err = errno;
         if (err == EINPROGRESS) {
             if (!waitForSocket(POLLOUT)) {
                 return false;
@@ -165,7 +164,6 @@ bool Socket::connect(void) {
 }
 
 bool Socket::sendToServer(BinaryQueue &queue) {
-    ssize_t done = 0;
     bool retry = false;
 
     RawBuffer buffer(queue.size());
@@ -178,7 +176,7 @@ bool Socket::sendToServer(BinaryQueue &queue) {
         }
 
         retry = false;
-        done = 0;
+        ssize_t done = 0;
         while ((buffer.size() - done) > 0) {
             if (! waitForSocket(POLLOUT)) {
                 LOGE("Error in poll(POLLOUT)");
diff --git a/src/service/main/main.cpp b/src/service/main/main.cpp
index ce7b07b..23362c2 100644
--- a/src/service/main/main.cpp
+++ b/src/service/main/main.cpp
@@ -34,8 +34,6 @@
 #include "Cynara.h"
 
 int main(int argc UNUSED, char **argv UNUSED) {
-    int ret;
-
     init_log();
 
     try {
@@ -44,7 +42,7 @@ int main(int argc UNUSED, char **argv UNUSED) {
         cynara.init();
         LOGI("Cynara service is started");
 
-        ret = sd_notify(0, "READY=1");
+        int ret = sd_notify(0, "READY=1");
         if (ret == 0) {
             LOGW("Cynara was not configured to notify its status");
         } else if (ret < 0) {
-- 
2.7.4