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

rxr: missed out on initializing function pointers to null (rxr)

Browse Source
This commit is contained in:
maliakal_d 2020-08-10 16:54:25 +02:00
parent 27b2a607c8
commit 21995b3d4a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
slsReceiverSoftware/src/Implementation.h
View File

@ -295,8 +295,9 @@ class Implementation : private virtual slsDetectorDefs {
// network configuration (UDP) // network configuration (UDP)
int numUDPInterfaces{1}; int numUDPInterfaces{1};
std::array<std::string,MAX_NUMBER_OF_LISTENING_THREADS>eth; std::array<std::string, MAX_NUMBER_OF_LISTENING_THREADS> eth;
std::array<uint32_t,MAX_NUMBER_OF_LISTENING_THREADS> udpPortNum{{DEFAULT_UDP_PORTNO, DEFAULT_UDP_PORTNO+1}}; std::array<uint32_t, MAX_NUMBER_OF_LISTENING_THREADS> udpPortNum{
{DEFAULT_UDP_PORTNO, DEFAULT_UDP_PORTNO + 1}};
int64_t udpSocketBufferSize{0}; int64_t udpSocketBufferSize{0};
int64_t actualUDPSocketBufferSize{0}; int64_t actualUDPSocketBufferSize{0};
@ -350,12 +351,13 @@ class Implementation : private virtual slsDetectorDefs {
// callbacks // callbacks
int (*startAcquisitionCallBack)(std::string, std::string, uint64_t, int (*startAcquisitionCallBack)(std::string, std::string, uint64_t,
uint32_t, void *){nullptr}; uint32_t, void *){nullptr};
void *pStartAcquisition; void *pStartAcquisition{nullptr};
void (*acquisitionFinishedCallBack)(uint64_t, void *); void (*acquisitionFinishedCallBack)(uint64_t, void *){nullptr};
void *pAcquisitionFinished; void *pAcquisitionFinished{nullptr};
void (*rawDataReadyCallBack)(char *, char *, uint32_t, void *); void (*rawDataReadyCallBack)(char *, char *, uint32_t, void *){nullptr};
void (*rawDataModifyReadyCallBack)(char *, char *, uint32_t &, void *); void (*rawDataModifyReadyCallBack)(char *, char *, uint32_t &,
void *pRawDataReady; void *){nullptr};
void *pRawDataReady{nullptr};
// class objects // class objects
GeneralData *generalData; GeneralData *generalData;