From 6682225dbdbd9f6ffd1a2183a8587bc2267f27fe Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Tue, 12 Jan 2010 14:34:41 +0000
Subject: [PATCH] From Andreas: MkDir() returns now an Int_t instead of a
Bool_t. Patch is needed for the ALICE ODBC.
git-svn-id: http://root.cern.ch/svn/root/trunk@31993 27541ba8-7e3a-0410-8455-c3a389f83636
---
net/alien/inc/TAlien.h | 2 +-
net/alien/src/TAlien.cxx | 9 ++++-----
net/glite/inc/TGLite.h | 2 +-
net/glite/src/TGLite.cxx | 2 +-
net/net/inc/TGrid.h | 2 +-
5 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/net/alien/inc/TAlien.h b/net/alien/inc/TAlien.h
index 8bc3ce10ba1..1c6880a8d5b 100644
--- a/net/alien/inc/TAlien.h
+++ b/net/alien/inc/TAlien.h
@@ -88,7 +88,7 @@ public:
virtual const char *Pwd(Bool_t verbose=kFALSE);
virtual const char *GetHomeDirectory() { return fHome.Data(); }
virtual Bool_t Cd(const char *ldn="", Bool_t verbose=kFALSE);
- virtual Bool_t Mkdir(const char *ldn="", Option_t *options="", Bool_t verbose=kFALSE);
+ virtual Int_t Mkdir(const char *ldn="", Option_t *options="", Bool_t verbose=kFALSE);
virtual Bool_t Rmdir(const char *ldn="", Option_t *options="", Bool_t verbose=kFALSE);
virtual Bool_t Register(const char *lfn, const char *turl, Long_t size=-1,
const char *se=0, const char *guid=0, Bool_t verbose=kFALSE);
diff --git a/net/alien/src/TAlien.cxx b/net/alien/src/TAlien.cxx
index b70f13c8ae6..108688caf66 100644
--- a/net/alien/src/TAlien.cxx
+++ b/net/alien/src/TAlien.cxx
@@ -504,7 +504,7 @@ const char* TAlien::Pwd(Bool_t verbose)
}
//______________________________________________________________________________
-Bool_t TAlien::Mkdir(const char* ldn, Option_t* options, Bool_t verbose)
+Int_t TAlien::Mkdir(const char* ldn, Option_t* options, Bool_t verbose)
{
TString cmdline = TString("mkdir");
if (strlen(options)) {
@@ -523,15 +523,15 @@ Bool_t TAlien::Mkdir(const char* ldn, Option_t* options, Bool_t verbose)
const char* result = (GetStreamFieldValue(kOUTPUT,0,0));
if (result) {
if (strlen(result) > 0) {
- if (atoi(result) == 1) {
- return kTRUE;
+ if (atoi(result) > 0) {
+ return atoi(result);
}
}
}
Error("Mkdir","Cannot create directory %s\n",ldn);
if (!verbose) Stdout();
- return kFALSE;
+ return 0;
}
//______________________________________________________________________________
@@ -775,4 +775,3 @@ TGridResult* TAlien::ListPackages(const char* alienpackagedir)
}
return gr;
}
-
diff --git a/net/glite/inc/TGLite.h b/net/glite/inc/TGLite.h
index 55931f3c7e0..b8e00f68e2d 100644
--- a/net/glite/inc/TGLite.h
+++ b/net/glite/inc/TGLite.h
@@ -58,7 +58,7 @@ public:
virtual TGridResult* Ls(const char *_ldn = "", Option_t* /*options*/ = "", Bool_t /*verbose*/ = kFALSE);
virtual const char* Pwd(Bool_t /*verbose*/ = kFALSE);
virtual Bool_t Cd(const char *_ldn = "", Bool_t /*verbose*/ = kFALSE);
- virtual Bool_t Mkdir(const char *_ldn = "", Option_t* /*options*/ = "", Bool_t /*verbose*/ = kFALSE);
+ virtual Int_t Mkdir(const char *_ldn = "", Option_t* /*options*/ = "", Bool_t /*verbose*/ = kFALSE);
virtual Bool_t Rmdir(const char *_ldn = "", Option_t* /*options*/ = "", Bool_t /*verbose*/ = kFALSE);
virtual Bool_t Register(const char *_lfn, const char *_turl , Long_t /*size*/ = -1, const char *_se = 0, const char *_guid = 0, Bool_t /*verbose*/ = kFALSE);
virtual Bool_t Rm(const char *_lfn, Option_t* /*option*/ = "", Bool_t /*verbose*/ = kFALSE);
diff --git a/net/glite/src/TGLite.cxx b/net/glite/src/TGLite.cxx
index a7ba1b83469..7a7557e0a44 100644
--- a/net/glite/src/TGLite.cxx
+++ b/net/glite/src/TGLite.cxx
@@ -435,7 +435,7 @@ Bool_t TGLite::Cd(const char *_ldn, Bool_t /*verbose*/)
//______________________________________________________________________________
-Bool_t TGLite::Mkdir(const char *_ldn, Option_t* /*options*/, Bool_t /*verbose*/)
+Int_t TGLite::Mkdir(const char *_ldn, Option_t* /*options*/, Bool_t /*verbose*/)
{
// A File Catalog method. Create a new directory on the name server.
// INPUT:
diff --git a/net/net/inc/TGrid.h b/net/net/inc/TGrid.h
index 3612c0ab5fe..401b58c98b0 100644
--- a/net/net/inc/TGrid.h
+++ b/net/net/inc/TGrid.h
@@ -96,7 +96,7 @@ public:
{ MayNotUse("GetHomeDirectory"); return 0; }
virtual Bool_t Cd(const char* /*ldn*/ ="",Bool_t /*verbose*/ =kFALSE)
{ MayNotUse("Cd"); return kFALSE; }
- virtual Bool_t Mkdir(const char* /*ldn*/ ="", Option_t* /*options*/ ="", Bool_t /*verbose*/ =kFALSE)
+ virtual Int_t Mkdir(const char* /*ldn*/ ="", Option_t* /*options*/ ="", Bool_t /*verbose*/ =kFALSE)
{ MayNotUse("Mkdir"); return kFALSE; }
virtual Bool_t Rmdir(const char* /*ldn*/ ="", Option_t* /*options*/ ="", Bool_t /*verbose*/ =kFALSE)
{ MayNotUse("Mkdir"); return kFALSE; }
--
GitLab