detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 06:50:02 +02:00
Code Issues Actions Packages Releases Activity

renamed function to checkArgs

Browse Source
This commit is contained in:
Erik Frojdh 2020-07-24 14:26:58 +02:00
parent 1fefc001f9
commit 097acf8086
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/src/Module.cpp
View File

@ -2386,7 +2386,7 @@ uint64_t Module::getReceiverCurrentFrameIndex() const {
// private // 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 { size_t retval_size) const {
if (args == nullptr && args_size != 0) if (args == nullptr && args_size != 0)
throw RuntimeError( 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 // This is the only function that actually sends data to the detector
// the other versions use templates to deduce sizes and create // the other versions use templates to deduce sizes and create
// the return type // the return type
preSendArgsCheck(args, args_size, retval, retval_size); checkArgs(args, args_size, retval, retval_size);
auto client = DetectorSocket(shm()->hostname, shm()->controlPort); auto client = DetectorSocket(shm()->hostname, shm()->controlPort);
client.sendCommandThenRead(fnum, args, args_size, retval, retval_size); client.sendCommandThenRead(fnum, args, args_size, retval, retval_size);
client.close(); 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 // This is the only function that actually sends data to the detector stop
// the other versions use templates to deduce sizes and create // the other versions use templates to deduce sizes and create
// the return type // the return type
preSendArgsCheck(args, args_size, retval, retval_size); checkArgs(args, args_size, retval, retval_size);
auto stop = DetectorSocket(shm()->hostname, shm()->stopPort); auto stop = DetectorSocket(shm()->hostname, shm()->stopPort);
stop.sendCommandThenRead(fnum, args, args_size, retval, retval_size); stop.sendCommandThenRead(fnum, args, args_size, retval, retval_size);
stop.close(); stop.close();
@ -2650,7 +2650,7 @@ void Module::sendToReceiver(int fnum, const void *args, size_t args_size,
oss << getFunctionNameFromEnum(static_cast<detFuncs>(fnum)); oss << getFunctionNameFromEnum(static_cast<detFuncs>(fnum));
throw RuntimeError(oss.str()); 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); auto receiver = ReceiverSocket(shm()->rxHostname, shm()->rxTCPPort);
receiver.sendCommandThenRead(fnum, args, args_size, retval, retval_size); receiver.sendCommandThenRead(fnum, args, args_size, retval, retval_size);
receiver.close(); receiver.close();

2
slsDetectorSoftware/src/Module.h
View File

@ -518,7 +518,7 @@ class Module : public virtual slsDetectorDefs {
uint64_t getReceiverCurrentFrameIndex() const; uint64_t getReceiverCurrentFrameIndex() const;
private: 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; size_t retval_size) const;
/** /**