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

arguments stays for unknown enum

Browse Source
This commit is contained in:
maliakal_d 2021-11-09 15:41:59 +01:00
parent 1fd15fadf8
commit 898ee9b7b7
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,9 +432,7 @@ void function_table() {
void functionNotImplemented() { void functionNotImplemented() {
ret = FAIL; ret = FAIL;
sprintf(mess, sprintf(mess, "Function (%s) is not implemented for this detector\n",
"Function (%s) is not implemented for this detector. Please do not "
"proceed.\n",
getFunctionNameFromEnum((enum detFuncs)fnum)); getFunctionNameFromEnum((enum detFuncs)fnum));
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} }
@ -486,8 +484,17 @@ int executeCommand(char *command, char *result, enum TLogLevel level) {
} }
int M_nofunc(int file_des) { int M_nofunc(int file_des) {
ret = FAIL;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
functionNotImplemented();
// to receive any arguments
int n = 1;
while (n > 0)
n = receiveData(file_des, mess, MAX_STR_LENGTH, OTHER);
sprintf(mess, "Unrecognized Function enum %d. Please do not proceed.\n",
fnum);
LOG(logERROR, (mess));
return Server_SendResult(file_des, OTHER, NULL, 0); return Server_SendResult(file_des, OTHER, NULL, 0);
} }
@ -1555,8 +1562,15 @@ int set_module(int file_des) {
} }
} }
// receive all arguments
if (ret == FAIL) {
int n = 1;
while (n > 0)
n = receiveData(file_des, mess, MAX_STR_LENGTH, OTHER);
}
// only set // only set
if (ret == OK && Server_VerifyLock() == OK) { else if (Server_VerifyLock() == OK) {
// check index // check index
// setsettings // setsettings
@ -3628,6 +3642,10 @@ int program_fpga(int file_des) {
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
#if defined(EIGERD) || defined(GOTTHARDD) #if defined(EIGERD) || defined(GOTTHARDD)
// to receive any arguments
int n = 1;
while (n > 0)
n = receiveData(file_des, mess, MAX_STR_LENGTH, OTHER);
functionNotImplemented(); functionNotImplemented();
return Server_SendResult(file_des, INT32, NULL, 0); return Server_SendResult(file_des, INT32, NULL, 0);
#else #else
@ -9304,6 +9322,10 @@ int update_kernel(int file_des) {
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
#if !defined(JUNGFRAUD) && !defined(CHIPTESTBOARDD) && !defined(MOENCHD) && \ #if !defined(JUNGFRAUD) && !defined(CHIPTESTBOARDD) && !defined(MOENCHD) && \
!defined(GOTTHARDD) !defined(GOTTHARDD)
// to receive any arguments
int n = 1;
while (n > 0)
n = receiveData(file_des, mess, MAX_STR_LENGTH, OTHER);
functionNotImplemented(); functionNotImplemented();
return Server_SendResult(file_des, INT32, NULL, 0); return Server_SendResult(file_des, INT32, NULL, 0);
#else #else