From b9c9d0ef5b7db5743af18ce9b72a601f3e1a33ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Oliver=20Cort=C3=A9s?= <pablo.oliver.cortes@cern.ch>
Date: Thu, 20 Feb 2025 14:22:09 +0100
Subject: [PATCH 1/4] Add 'throw'
---
tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
index 279b6f9d9b..bb2afca003 100644
--- a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
+++ b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
@@ -1307,7 +1307,7 @@ void drive::DriveGeneric::readExactBlock(void * data, size_t count, const std::s
delete[] dataWithCrc32c;
} else {
delete[] dataWithCrc32c;
- cta::exception::Exception(context+"Failed checksum verification for ST read"
+ throw cta::exception::Exception(context+"Failed checksum verification for ST read"
" in DriveGeneric::readBlock");
}
break;
--
GitLab
From e3048edebe7ddca33c81431de8a50265b2b7d37a Mon Sep 17 00:00:00 2001
From: poliverc <pablo.oliver.cortes@cern.ch>
Date: Thu, 20 Feb 2025 14:23:57 +0100
Subject: [PATCH 2/4] Applied clang format to changed lines
---
tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
index bb2afca003..65ebfddaf5 100644
--- a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
+++ b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
@@ -1307,8 +1307,8 @@ void drive::DriveGeneric::readExactBlock(void * data, size_t count, const std::s
delete[] dataWithCrc32c;
} else {
delete[] dataWithCrc32c;
- throw cta::exception::Exception(context+"Failed checksum verification for ST read"
- " in DriveGeneric::readBlock");
+ throw cta::exception::Exception(context + "Failed checksum verification for ST read"
+ " in DriveGeneric::readBlock");
}
break;
}
--
GitLab
From aefd6a6323a45953b488a78cba342c78708a845b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Oliver=20Cort=C3=A9s?= <pablo.oliver.cortes@cern.ch>
Date: Thu, 20 Feb 2025 14:38:24 +0100
Subject: [PATCH 3/4] Add CRC32c values to context for log message
---
common/CRC.cpp | 5 +++--
tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/common/CRC.cpp b/common/CRC.cpp
index 98eba6d5cb..bcd1dd0f66 100644
--- a/common/CRC.cpp
+++ b/common/CRC.cpp
@@ -254,9 +254,10 @@ bool verifyCrc32cForMemoryBlockWithCrc32c(
(start[cnt-2] << 16) |
(start[cnt-1] << 24);
- if (crccmp != crcblk)
+ if (crccmp != crcblk){
return false; //block CRC is incorrect
+ }
return true;
}
-} // namespace cta
\ No newline at end of file
+} // namespace cta
diff --git a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
index 65ebfddaf5..bfd20c713f 100644
--- a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
+++ b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
@@ -1307,8 +1307,8 @@ void drive::DriveGeneric::readExactBlock(void * data, size_t count, const std::s
delete[] dataWithCrc32c;
} else {
delete[] dataWithCrc32c;
- throw cta::exception::Exception(context + "Failed checksum verification for ST read"
- " in DriveGeneric::readBlock");
+ throw cta::exception::Exception(context+" Failed checksum verification for ST read"
+ " in DriveGeneric::readBlock.");
}
break;
}
--
GitLab
From 484b3d3c485a4caa6928d478bea8ae0177cd38b4 Mon Sep 17 00:00:00 2001
From: poliverc <pablo.oliver.cortes@cern.ch>
Date: Thu, 20 Feb 2025 16:39:27 +0100
Subject: [PATCH 4/4] Applied clang format to changed lines
---
common/CRC.cpp | 4 ++--
tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/CRC.cpp b/common/CRC.cpp
index bcd1dd0f66..bae5739703 100644
--- a/common/CRC.cpp
+++ b/common/CRC.cpp
@@ -254,10 +254,10 @@ bool verifyCrc32cForMemoryBlockWithCrc32c(
(start[cnt-2] << 16) |
(start[cnt-1] << 24);
- if (crccmp != crcblk){
+ if (crccmp != crcblk) {
return false; //block CRC is incorrect
}
return true;
}
-} // namespace cta
+} // namespace cta
diff --git a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
index bfd20c713f..f288007078 100644
--- a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
+++ b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
@@ -1307,8 +1307,8 @@ void drive::DriveGeneric::readExactBlock(void * data, size_t count, const std::s
delete[] dataWithCrc32c;
} else {
delete[] dataWithCrc32c;
- throw cta::exception::Exception(context+" Failed checksum verification for ST read"
- " in DriveGeneric::readBlock.");
+ throw cta::exception::Exception(context + " Failed checksum verification for ST read"
+ " in DriveGeneric::readBlock.");
}
break;
}
--
GitLab