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

functions not overriding base and unitialized use

Browse Source
This commit is contained in:
Erik Frojdh 2019-01-11 11:27:48 +01:00
parent c6a597c3ec
commit 1bd0b33806
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -2606,7 +2606,7 @@ std::string slsDetectorCommand::helpThreaded(int action) {
std::string slsDetectorCommand::cmdImage(int narg, char *args[], int action, int detPos) { std::string slsDetectorCommand::cmdImage(int narg, char *args[], int action, int detPos) {
std::string sval; std::string sval;
int retval; int retval = FAIL;
if (action == HELP_ACTION) if (action == HELP_ACTION)
return helpImage(HELP_ACTION); return helpImage(HELP_ACTION);
else if (action == GET_ACTION) else if (action == GET_ACTION)
@ -2643,7 +2643,7 @@ std::string slsDetectorCommand::cmdCounter(int narg, char *args[], int action, i
int ival; int ival;
char answer[100]; char answer[100];
std::string sval; std::string sval;
int retval; int retval = FAIL;
if (action == HELP_ACTION) if (action == HELP_ACTION)
return helpCounter(HELP_ACTION); return helpCounter(HELP_ACTION);
else if (action == PUT_ACTION) else if (action == PUT_ACTION)

2
slsReceiverSoftware/include/BinaryFile.h
View File

@ -47,7 +47,7 @@ class BinaryFile : private virtual slsDetectorDefs, public File, public BinaryFi
/** /**
* Print all member values * Print all member values
*/ */
void PrintMembers(); void PrintMembers(TLogLevel level = logDEBUG1);
/** /**
* Create file * Create file

4
slsReceiverSoftware/src/BinaryFile.cpp
View File

@ -31,8 +31,8 @@ BinaryFile::~BinaryFile() {
CloseAllFiles(); CloseAllFiles();
} }
void BinaryFile::PrintMembers() { void BinaryFile::PrintMembers(TLogLevel level) {
File::PrintMembers(); File::PrintMembers(level);
FILE_LOG(logINFO) << "Max Frames Per File: " << *maxFramesPerFile; FILE_LOG(logINFO) << "Max Frames Per File: " << *maxFramesPerFile;
FILE_LOG(logINFO) << "Number of Frames in File: " << numFramesInFile; FILE_LOG(logINFO) << "Number of Frames in File: " << numFramesInFile;
} }

4
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -705,8 +705,8 @@ int slsReceiverTCPIPInterface::set_roi() {
int slsReceiverTCPIPInterface::setup_udp(){ int slsReceiverTCPIPInterface::setup_udp(){
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
char args[3][MAX_STR_LENGTH] = {0}; char args[3][MAX_STR_LENGTH] = {{""}, {""}, {""}};
char retvals[MAX_STR_LENGTH] = {0}; char retvals[MAX_STR_LENGTH] = {""};
// get args, return if socket crashed, ret is fail if receiver is not null // get args, return if socket crashed, ret is fail if receiver is not null
if (interface->Server_ReceiveArg(ret, mess, args, sizeof(args), true, receiver) == FAIL) if (interface->Server_ReceiveArg(ret, mess, args, sizeof(args), true, receiver) == FAIL)