From da9ea26662767845f23e2295709bb748af85a14b Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Wed, 23 Apr 2008 13:10:30 +0000
Subject: [PATCH] Fix shadowed variables
git-svn-id: http://root.cern.ch/svn/root/trunk@23459 27541ba8-7e3a-0410-8455-c3a389f83636
---
net/net/src/TSocket.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/net/src/TSocket.cxx b/net/net/src/TSocket.cxx
index 936dfafa908..c810041ec25 100644
--- a/net/net/src/TSocket.cxx
+++ b/net/net/src/TSocket.cxx
@@ -650,15 +650,15 @@ Int_t TSocket::Recv(TMessage *&mess)
if (mess->What() & kMESS_ACK) {
char ok[2] = { 'o', 'k' };
- Int_t n = 0;
- if ((n = gSystem->SendRaw(fSocket, ok, sizeof(ok), 0)) < 0) {
- if (n == -5) {
+ Int_t n2 = 0;
+ if ((n2 = gSystem->SendRaw(fSocket, ok, sizeof(ok), 0)) < 0) {
+ if (n2 == -5) {
// Connection reset or broken
Close();
}
delete mess;
mess = 0;
- return n;
+ return n2;
}
mess->SetWhat(mess->What() & ~kMESS_ACK);
@@ -854,7 +854,7 @@ Bool_t TSocket::Authenticate(const char *user)
rc = kFALSE;
// Receive confirmation that everything went well
- Int_t kind, stat;
+ Int_t stat;
if (Recv(stat, kind) > 0) {
if (kind == kROOTD_ERR) {
--
GitLab