From 097acf808673ea59cc10c5be4e60b3d9f83a4213 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Fri, 24 Jul 2020 14:26:58 +0200 Subject: [PATCH] renamed function to checkArgs --- slsDetectorSoftware/src/Module.cpp | 8 ++++---- slsDetectorSoftware/src/Module.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index ba1b99b38..641c5926e 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -2386,7 +2386,7 @@ uint64_t Module::getReceiverCurrentFrameIndex() const { // private -void Module::preSendArgsCheck(const void *args, size_t args_size, void *retval, +void Module::checkArgs(const void *args, size_t args_size, void *retval, size_t retval_size) const { if (args == nullptr && args_size != 0) throw RuntimeError( @@ -2415,7 +2415,7 @@ void Module::sendToDetector(int fnum, const void *args, size_t args_size, // This is the only function that actually sends data to the detector // the other versions use templates to deduce sizes and create // the return type - preSendArgsCheck(args, args_size, retval, retval_size); + checkArgs(args, args_size, retval, retval_size); auto client = DetectorSocket(shm()->hostname, shm()->controlPort); client.sendCommandThenRead(fnum, args, args_size, retval, retval_size); client.close(); @@ -2528,7 +2528,7 @@ void Module::sendToDetectorStop(int fnum, const void *args, size_t args_size, // This is the only function that actually sends data to the detector stop // the other versions use templates to deduce sizes and create // the return type - preSendArgsCheck(args, args_size, retval, retval_size); + checkArgs(args, args_size, retval, retval_size); auto stop = DetectorSocket(shm()->hostname, shm()->stopPort); stop.sendCommandThenRead(fnum, args, args_size, retval, retval_size); stop.close(); @@ -2650,7 +2650,7 @@ void Module::sendToReceiver(int fnum, const void *args, size_t args_size, oss << getFunctionNameFromEnum(static_cast(fnum)); throw RuntimeError(oss.str()); } - preSendArgsCheck(args, args_size, retval, retval_size); + checkArgs(args, args_size, retval, retval_size); auto receiver = ReceiverSocket(shm()->rxHostname, shm()->rxTCPPort); receiver.sendCommandThenRead(fnum, args, args_size, retval, retval_size); receiver.close(); diff --git a/slsDetectorSoftware/src/Module.h b/slsDetectorSoftware/src/Module.h index 03af74c11..50ba70764 100644 --- a/slsDetectorSoftware/src/Module.h +++ b/slsDetectorSoftware/src/Module.h @@ -518,7 +518,7 @@ class Module : public virtual slsDetectorDefs { uint64_t getReceiverCurrentFrameIndex() const; private: - void preSendArgsCheck(const void *args, size_t args_size, void *retval, + void checkArgs(const void *args, size_t args_size, void *retval, size_t retval_size) const; /**