From 367bcde46224fba0ffe8774746b06446e70efe96 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Thu, 26 Sep 2019 13:35:16 +0200
Subject: [PATCH] Renamed local variable encryptionkey to encryptionkeyName
within RequestMessage::processTape_Ch()
---
xroot_plugins/XrdSsiCtaRequestMessage.cpp | 26 +++++++++++------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/xroot_plugins/XrdSsiCtaRequestMessage.cpp b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
index 850a0bb8ee..aa2ccd18dc 100644
--- a/xroot_plugins/XrdSsiCtaRequestMessage.cpp
+++ b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
@@ -1336,17 +1336,17 @@ void RequestMessage::processTape_Ch(cta::xrd::Response &response)
{
using namespace cta::admin;
- auto &vid = getRequired(OptionString::VID);
- auto mediaType = getOptional(OptionString::MEDIA_TYPE);
- auto vendor = getOptional(OptionString::VENDOR);
- auto logicallibrary = getOptional(OptionString::LOGICAL_LIBRARY);
- auto tapepool = getOptional(OptionString::TAPE_POOL);
- auto capacity = getOptional(OptionUInt64::CAPACITY);
- auto comment = getOptional(OptionString::COMMENT);
- auto encryptionkey = getOptional(OptionString::ENCRYPTION_KEY);
- auto disabled = getOptional(OptionBoolean::DISABLED);
- auto full = getOptional(OptionBoolean::FULL);
- auto readOnly = getOptional(OptionBoolean::READ_ONLY);
+ auto &vid = getRequired(OptionString::VID);
+ auto mediaType = getOptional(OptionString::MEDIA_TYPE);
+ auto vendor = getOptional(OptionString::VENDOR);
+ auto logicallibrary = getOptional(OptionString::LOGICAL_LIBRARY);
+ auto tapepool = getOptional(OptionString::TAPE_POOL);
+ auto capacity = getOptional(OptionUInt64::CAPACITY);
+ auto comment = getOptional(OptionString::COMMENT);
+ auto encryptionkeyName = getOptional(OptionString::ENCRYPTION_KEY);
+ auto disabled = getOptional(OptionBoolean::DISABLED);
+ auto full = getOptional(OptionBoolean::FULL);
+ auto readOnly = getOptional(OptionBoolean::READ_ONLY);
if(mediaType) {
m_catalogue.modifyTapeMediaType(m_cliIdentity, vid, mediaType.value());
@@ -1366,8 +1366,8 @@ void RequestMessage::processTape_Ch(cta::xrd::Response &response)
if(comment) {
m_catalogue.modifyTapeComment(m_cliIdentity, vid, comment.value());
}
- if(encryptionkey) {
- m_catalogue.modifyTapeEncryptionKeyName(m_cliIdentity, vid, encryptionkey.value());
+ if(encryptionkeyName) {
+ m_catalogue.modifyTapeEncryptionKeyName(m_cliIdentity, vid, encryptionkeyName.value());
}
if(disabled) {
m_catalogue.setTapeDisabled(m_cliIdentity, vid, disabled.value());
--
GitLab