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

m3 fix to get kernel version properly on nios without an incorrect error msg (#898)

Browse Source
This commit is contained in:
maliakal_d 2024-01-26 10:41:24 +01:00 committed by GitHub
parent 5e9fd43d49
commit a884db0e2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

5
slsDetectorServers/slsDetectorServer/src/common.c
View File

@ -114,10 +114,11 @@ int getTimeFromString(char *buf, time_t *result) {
t.tm_mday, t.tm_mon, t.tm_year + 1900, t.tm_hour, t.tm_min, t.tm_sec)); t.tm_mday, t.tm_mon, t.tm_year + 1900, t.tm_hour, t.tm_min, t.tm_sec));
*result = mktime(&t); *result = mktime(&t);
if (*result == -1) { /* Do not check as it fails with nios
if (*result == (time_t)-1) {
LOG(logERROR, ("Could not convert time structure to time_t\n")); LOG(logERROR, ("Could not convert time structure to time_t\n"));
return FAIL; return FAIL;
} }*/
return OK; return OK;
} }