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

changes to get rid of warnings

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-08-03 17:02:40 +02:00
parent c852463de1
commit 658f3459ca
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/include/sls_receiver_funcs.h
View File

@ -49,7 +49,9 @@ enum {
F_ENABLE_RECEIVER_OVERWRITE, /**< set overwrite flag in receiver */ F_ENABLE_RECEIVER_OVERWRITE, /**< set overwrite flag in receiver */
F_ENABLE_RECEIVER_TEN_GIGA, /**< enable 10Gbe in receiver */ F_ENABLE_RECEIVER_TEN_GIGA, /**< enable 10Gbe in receiver */
F_SET_RECEIVER_FIFO_DEPTH /**< set receiver fifo depth */ F_SET_RECEIVER_FIFO_DEPTH, /**< set receiver fifo depth */
F_SET_TRANSMISSION_DELAY /**< set transmission delay */
/* Always append functions hereafter!!! */ /* Always append functions hereafter!!! */
}; };

4
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -1897,7 +1897,7 @@ uint32_t UDPStandardImplementation::processListeningBuffer(int ithread, int cSiz
cSize += onePacketSize; cSize += onePacketSize;
lastPacketOffset -= onePacketSize; lastPacketOffset -= onePacketSize;
--packetCount; --packetCount;
while (lastFrameHeader64 == (*( (uint32_t*) header->frameNumber))&0xffffff){ while (lastFrameHeader64 == ((*( (uint32_t*) header->frameNumber))&0xffffff)){
cSize += onePacketSize; cSize += onePacketSize;
lastPacketOffset -= onePacketSize; lastPacketOffset -= onePacketSize;
header = (jfrau_packet_header_t*) (buffer[ithread]+lastPacketOffset); header = (jfrau_packet_header_t*) (buffer[ithread]+lastPacketOffset);
@ -2866,7 +2866,7 @@ void UDPStandardImplementation::updateFileHeader(){
//update file header //update file header
time_t t = time(0); time_t t = time(0);
int length = sizeof(fileHeader); int length = sizeof(fileHeader);
while(length!=strlen(fileHeader)){ while((unsigned int)length!=strlen(fileHeader)){
length = strlen(fileHeader); length = strlen(fileHeader);
sprintf(fileHeader,"\nHeader\t\t %d bytes\n" sprintf(fileHeader,"\nHeader\t\t %d bytes\n"
"Dynamic Range\t %d\n" "Dynamic Range\t %d\n"