diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 1f2451146..14baf8860 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -2606,7 +2606,7 @@ std::string slsDetectorCommand::helpThreaded(int action) { std::string slsDetectorCommand::cmdImage(int narg, char *args[], int action, int detPos) { std::string sval; - int retval; + int retval = FAIL; if (action == HELP_ACTION) return helpImage(HELP_ACTION); else if (action == GET_ACTION) @@ -2643,7 +2643,7 @@ std::string slsDetectorCommand::cmdCounter(int narg, char *args[], int action, i int ival; char answer[100]; std::string sval; - int retval; + int retval = FAIL; if (action == HELP_ACTION) return helpCounter(HELP_ACTION); else if (action == PUT_ACTION) diff --git a/slsReceiverSoftware/include/BinaryFile.h b/slsReceiverSoftware/include/BinaryFile.h index 98f7d2a22..8d9324df7 100644 --- a/slsReceiverSoftware/include/BinaryFile.h +++ b/slsReceiverSoftware/include/BinaryFile.h @@ -47,7 +47,7 @@ class BinaryFile : private virtual slsDetectorDefs, public File, public BinaryFi /** * Print all member values */ - void PrintMembers(); + void PrintMembers(TLogLevel level = logDEBUG1); /** * Create file diff --git a/slsReceiverSoftware/src/BinaryFile.cpp b/slsReceiverSoftware/src/BinaryFile.cpp index 47af53f20..d64c6745a 100644 --- a/slsReceiverSoftware/src/BinaryFile.cpp +++ b/slsReceiverSoftware/src/BinaryFile.cpp @@ -31,8 +31,8 @@ BinaryFile::~BinaryFile() { CloseAllFiles(); } -void BinaryFile::PrintMembers() { - File::PrintMembers(); +void BinaryFile::PrintMembers(TLogLevel level) { + File::PrintMembers(level); FILE_LOG(logINFO) << "Max Frames Per File: " << *maxFramesPerFile; FILE_LOG(logINFO) << "Number of Frames in File: " << numFramesInFile; } diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index 34ec324b1..abd9573cf 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -705,8 +705,8 @@ int slsReceiverTCPIPInterface::set_roi() { int slsReceiverTCPIPInterface::setup_udp(){ ret = OK; memset(mess, 0, sizeof(mess)); - char args[3][MAX_STR_LENGTH] = {0}; - char retvals[MAX_STR_LENGTH] = {0}; + char args[3][MAX_STR_LENGTH] = {{""}, {""}, {""}}; + char retvals[MAX_STR_LENGTH] = {""}; // 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)