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

nios, for variable delcaration in loop

Browse Source
This commit is contained in:
maliakal_d
2020-05-08 09:39:36 +02:00
parent 9b21f44d94
commit 2f11dbc2c9
3 changed files with 149 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -1762,10 +1762,8 @@ int set_module(int file_des) {
module.ndac = getNumberOfDACs();
int ts = receiveModule(file_des, &module);
if (ts < 0) {
if (myChan != NULL)
free(myChan);
if (myDac != NULL)
free(myDac);
free(myChan);
free(myDac);
return printSocketReadError();
}
LOG(logDEBUG1, ("module register is %d, nchan %d, nchip %d, "
@ -1829,10 +1827,8 @@ int set_module(int file_des) {
LOG(logDEBUG1, ("Settings: %d\n", retval));
#endif
}
if (myChan != NULL)
free(myChan);
if (myDac != NULL)
free(myDac);
free(myChan);
free(myDac);
#endif
return Server_SendResult(file_des, INT32, NULL, 0);
@ -1895,10 +1891,8 @@ int get_module(int file_des) {
if (ret != FAIL) {
ret = sendModule(file_des, &module);
}
if (myChan != NULL)
free(myChan);
if (myDac != NULL)
free(myDac);
free(myChan);
free(myDac);
return ret;
}
@ -3934,8 +3928,7 @@ int program_fpga(int file_des) {
Server_SendResult(file_des, INT32, NULL, 0);
// free resources
if (fpgasrc != NULL)
free(fpgasrc);
free(fpgasrc);
}
#else // jungfrau, ctb, moench
@ -4009,8 +4002,7 @@ int program_fpga(int file_des) {
stopWritingFPGAprogram(fp);
// free resources
if (fpgasrc != NULL)
free(fpgasrc);
free(fpgasrc);
if (fp != NULL)
fclose(fp);