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

replaced sprintf on the same buffer with strcat

Browse Source
This commit is contained in:
Erik Frojdh 2019-02-15 15:39:13 +01:00
parent 4a8a72c447
commit d0e1289c1b
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
slsSupportLib/include/ZmqSocket.h
View File

@ -254,7 +254,7 @@ public:
char* additionalJsonHeader = 0) { char* additionalJsonHeader = 0) {
char buf[MAX_STR_LENGTH] = "";
/** Json Header Format */ /** Json Header Format */
const char* jsonHeaderFormat = const char* jsonHeaderFormat =
"{" "{"
@ -286,7 +286,8 @@ public:
"\"flippedDataX\":%u" "\"flippedDataX\":%u"
;//"}\n"; ;//"}\n";
int length = sprintf(buf, jsonHeaderFormat, char buf[MAX_STR_LENGTH] = "";
sprintf(buf, jsonHeaderFormat,
jsonversion, dynamicrange, fileIndex, npixelsx, npixelsy, imageSize, jsonversion, dynamicrange, fileIndex, npixelsx, npixelsy, imageSize,
acqIndex, fIndex, (fname == NULL)? "":fname, dummy?0:1, acqIndex, fIndex, (fname == NULL)? "":fname, dummy?0:1,
@ -297,11 +298,13 @@ public:
//additional stuff //additional stuff
((flippedData == 0 ) ? 0 :flippedData[0]) ((flippedData == 0 ) ? 0 :flippedData[0])
); );
if (additionalJsonHeader && strlen(additionalJsonHeader)) { if (additionalJsonHeader && strlen(additionalJsonHeader)) {
length = sprintf(buf, "%s, %s}\n", buf, additionalJsonHeader); strcat(buf, ", ");
} else { strcat(buf, additionalJsonHeader);
length = sprintf(buf, "%s}\n", buf); }
} strcat(buf, "}\n");
int length = strlen(buf);
#ifdef VERBOSE #ifdef VERBOSE
//if(!index) //if(!index)