commit 117912d2d1371e01c834dc493648fd1e56e7bfec
author William A. Kennington III <wak@google.com> Tue Jun 15 18:22:44 2021 -0700
committer William A. Kennington III <wak@google.com> Wed Jun 16 11:50:09 2021 -0700
tree 67e8b799bfed7fefc728ece39d335ffa0ff76ffc
parent 993f54198bd96800211e9cdcd141aed6b97f9e1f

ipmi: Remove non-standard c++ array syntax

Change-Id: I1c62222ab8584ffc5af6d99c80b93f5e93b4e26f
Signed-off-by: William A. Kennington III <wak@google.com>

ipmi.cpp

diff --git a/ipmi.cpp b/ipmi.cpp
index 976dbd2..f1f034c 100644
--- a/ipmi.cpp
+++ b/ipmi.cpp
@@ -113,7 +113,7 @@
      * reply buffer size. */
     reply->crc = 0;
     /* Explicilty copies the NUL-terminator. */
-    std::memcpy(&reply->blobId, blobId.c_str(), blobId.length() + 1);
+    std::memcpy(reply + 1, blobId.c_str(), blobId.length() + 1);
 
     (*dataLen) = sizeof(reply->crc) + blobId.length() + 1;
 
@@ -128,8 +128,9 @@
     uint16_t session;
     (*dataLen) = 0;
 
-    std::string path = stringFromBuffer(
-        request->blobId, (requestLen - sizeof(struct BmcBlobOpenTx)));
+    std::string path =
+        stringFromBuffer(reinterpret_cast<const char*>(request + 1),
+                         requestLen - sizeof(*request));
     if (path.empty())
     {
         return IPMI_CC_REQ_DATA_LEN_INVALID;
@@ -174,8 +175,9 @@
     auto request = reinterpret_cast<const struct BmcBlobDeleteTx*>(reqBuf);
     (*dataLen) = 0;
 
-    std::string path = stringFromBuffer(
-        request->blobId, (requestLen - sizeof(struct BmcBlobDeleteTx)));
+    std::string path =
+        stringFromBuffer(reinterpret_cast<const char*>(request + 1),
+                         requestLen - sizeof(*request));
     if (path.empty())
     {
         return IPMI_CC_REQ_DATA_LEN_INVALID;
@@ -219,8 +221,9 @@
     auto request = reinterpret_cast<const struct BmcBlobStatTx*>(reqBuf);
     (*dataLen) = 0;
 
-    std::string path = stringFromBuffer(
-        request->blobId, (requestLen - sizeof(struct BmcBlobStatTx)));
+    std::string path =
+        stringFromBuffer(reinterpret_cast<const char*>(request + 1),
+                         requestLen - sizeof(*request));
     if (path.empty())
     {
         return IPMI_CC_REQ_DATA_LEN_INVALID;
@@ -268,7 +271,7 @@
     }
 
     std::vector<uint8_t> data(request->commitDataLen);
-    std::memcpy(data.data(), request->commitData, request->commitDataLen);
+    std::memcpy(data.data(), request + 1, request->commitDataLen);
 
     if (!mgr->commit(request->sessionId, data))
     {
@@ -317,7 +320,7 @@
     uint32_t size = requestLen - sizeof(struct BmcBlobWriteTx);
     std::vector<uint8_t> data(size);
 
-    std::memcpy(data.data(), request->data, size);
+    std::memcpy(data.data(), request + 1, size);
 
     /* Attempt to write the bytes. */
     if (!mgr->write(request->sessionId, request->offset, data))