From b5f3f2aa4918a0a69ca327140464c11c7ca6719d Mon Sep 17 00:00:00 2001
From: Gerardo Ganis <Gerardo.Ganis@cern.ch>
Date: Tue, 22 Nov 2016 11:11:40 +0100
Subject: [PATCH] proof/proof: silence warning from TUri
---
proof/proof/src/TProof.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/proof/proof/src/TProof.cxx b/proof/proof/src/TProof.cxx
index bef4e7fc242..797ef01ed8a 100644
--- a/proof/proof/src/TProof.cxx
+++ b/proof/proof/src/TProof.cxx
@@ -12044,10 +12044,11 @@ Int_t TProof::AssertDataSet(TDSet *dset, TList *input,
// Check if the entry list is valid. If it has spaces, commas, or pipes,
// it is not considered as valid and we revert to the "multiple datasets"
// case
- Bool_t validEnl = ((enl.Index("|") == kNPOS) &&
- (enl.Index(",") == kNPOS) && (enl.Index(" ") == kNPOS));
+ TRegexp rg("[, |]");
+ Bool_t validEnl = (enl.Index(rg) == kNPOS) ? kTRUE : kFALSE;
+ Bool_t validSdsn = (dsns.Index(rg) == kNPOS) ? kTRUE : kFALSE;
- if (validEnl && (( fc = mgr->GetDataSet(dsns) ))) {
+ if (validEnl && validSdsn && (( fc = mgr->GetDataSet(dsns) ))) {
//
// String corresponds to ONE dataset only
@@ -12063,8 +12064,7 @@ Int_t TProof::AssertDataSet(TDSet *dset, TList *input,
// Adds the entry list (or empty string if not specified)
datasets->Add( new TPair(dataset, new TObjString( enl.Data() )) );
- }
- else {
+ } else {
//
// String does NOT correspond to one dataset: check if many datasets
--
GitLab