[trafficserver] 09/23: Step 9: Removes getVersion() and getVersion_ml()

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit ea3859d9d3a9d0ecf9ad42c72eca72de1db5658d
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Fri May 24 16:47:30 2019 -0600

    Step 9: Removes getVersion() and getVersion_ml()
---
 mgmt/Rollback.cc | 74 --------------------------------------------------------
 mgmt/Rollback.h  |  2 --
 2 files changed, 76 deletions(-)

diff --git a/mgmt/Rollback.cc b/mgmt/Rollback.cc
index fab496b..06a0e8c 100644
--- a/mgmt/Rollback.cc
+++ b/mgmt/Rollback.cc
@@ -203,80 +203,6 @@ Rollback::closeFile(int fd, bool callSync)
   return result;
 }
 
-RollBackCodes
-Rollback::getVersion(version_t version, TextBuffer **buffer)
-{
-  RollBackCodes r;
-
-  this->acquireLock();
-  r = getVersion_ml(version, buffer);
-  this->releaseLock();
-
-  return r;
-}
-
-// CALLEE DELETES STORAGE
-RollBackCodes
-Rollback::getVersion_ml(version_t version, TextBuffer **buffer)
-{
-  int diskFD;               // file descriptor for version of the file we are fetching
-  RollBackCodes returnCode; // our eventual return value
-  struct stat fileInfo;     // Info from fstat
-  int readResult;           // return val of (indirect) read calls
-  TextBuffer *newBuffer;    // return buffer
-
-  *buffer = nullptr;
-
-  if (version == currentVersion) {
-    version = ACTIVE_VERSION;
-  }
-  diskFD = openFile(version, O_RDONLY);
-
-  if (diskFD < 0) {
-    returnCode = FILE_NOT_FOUND_ROLLBACK;
-    goto GET_CLEANUP;
-  }
-  // fstat the file so that we know what size is supposed to be
-  if (fstat(diskFD, &fileInfo) < 0) {
-    mgmt_log("[Rollback::getVersion] fstat on %s version %d failed: %s\n", fileName, version, strerror(errno));
-    returnCode = FILE_NOT_FOUND_ROLLBACK;
-    goto GET_CLEANUP;
-  }
-  // Create a textbuffer of the
-  newBuffer = new TextBuffer(fileInfo.st_size + 1);
-
-  do {
-    readResult = newBuffer->readFromFD(diskFD);
-
-    if (readResult < 0) {
-      mgmt_log("[Rollback::getVersion] read failed on %s version %d: %s\n", fileName, version, strerror(errno));
-      returnCode = SYS_CALL_ERROR_ROLLBACK;
-      delete newBuffer;
-      goto GET_CLEANUP;
-    }
-  } while (readResult > 0);
-
-  if ((off_t)newBuffer->spaceUsed() != fileInfo.st_size) {
-    mgmt_log("[Rollback::getVersion] Incorrect amount of data retrieved from %s version %d.  Expected: %d   Got: %d\n", fileName,
-             version, fileInfo.st_size, newBuffer->spaceUsed());
-    returnCode = SYS_CALL_ERROR_ROLLBACK;
-    delete newBuffer;
-    goto GET_CLEANUP;
-  }
-
-  *buffer = newBuffer;
-
-  returnCode = OK_ROLLBACK;
-
-GET_CLEANUP:
-
-  if (diskFD >= 0) {
-    closeFile(diskFD, false);
-  }
-
-  return returnCode;
-}
-
 // version_t Rollback::extractVersionInfo(ExpandingArray* listNames,
 //                                        const char* testFileName)
 //
diff --git a/mgmt/Rollback.h b/mgmt/Rollback.h
index 90aeee7..335a02c 100644
--- a/mgmt/Rollback.h
+++ b/mgmt/Rollback.h
@@ -117,13 +117,11 @@ public:
   {
     ink_mutex_release(&fileAccessLock);
   };
-  RollBackCodes getVersion_ml(version_t version, TextBuffer **buffer);
   time_t versionTimeStamp_ml(version_t version);
   version_t extractVersionInfo(ExpandingArray *listNames, const char *testFileName);
 
   // Automatically take out lock
   bool checkForUserUpdate();
-  RollBackCodes getVersion(version_t version, TextBuffer **buffer);
   time_t versionTimeStamp(version_t version);
   int statVersion(version_t, struct stat *buf);
   bool setLastModifiedTime();