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

Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor

Browse Source
This commit is contained in:
maliakal_d 2019-01-15 20:06:19 +01:00
commit 9d9251293d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3008,7 +3008,7 @@ std::string slsDetector::setAdditionalJsonHeader(const std::string& jsonheader)
int ret = FAIL;
char args[MAX_STR_LENGTH] = {0};
char retvals[MAX_STR_LENGTH] = {0};
strcpy(args, jsonheader.c_str());
sls::strcpy_safe(args, jsonheader.c_str());
FILE_LOG(logDEBUG1) << "Sending additional json header " << args;
if (thisDetector->receiverOnlineFlag == ONLINE_FLAG && connectData() == OK) {
@ -4757,7 +4757,7 @@ std::string slsDetector::setFileName(const std::string& fname) {
setErrorMask((getErrorMask())|(RECEIVER_PARAMETER_NOT_SET));
} else {
FILE_LOG(logDEBUG1) << "Receiver file name: " << retvals;
strcpy(thisDetector->receiver_fileName, retvals);
sls::strcpy_safe(thisDetector->receiver_fileName, retvals);
if (ret == FORCE_UPDATE)
ret = updateReceiver();
}