# HG changeset patch # User Andrey Skvortsov # Date 1529998656 -10800 # Node ID f150783ee8e7a6227919576ce0828bb5eb9cf0f5 # Parent 09d5d14566165b431760fdafa51748422c2d783c Fix some compilation warnings for better ANSI C compliance diff -r 09d5d1456616 -r f150783ee8e7 targets/Linux/plc_Linux_main_retain.c --- a/targets/Linux/plc_Linux_main_retain.c Sat Jun 23 09:17:20 2018 +0200 +++ b/targets/Linux/plc_Linux_main_retain.c Tue Jun 26 10:37:36 2018 +0300 @@ -15,7 +15,7 @@ #include #include "iec_types.h" -int GetRetainSize(); +int GetRetainSize(void); /* Retain buffer. */ FILE *retain_buffer; diff -r 09d5d1456616 -r f150783ee8e7 targets/Win32/plc_Win32_main_retain.c --- a/targets/Win32/plc_Win32_main_retain.c Sat Jun 23 09:17:20 2018 +0200 +++ b/targets/Win32/plc_Win32_main_retain.c Tue Jun 26 10:37:36 2018 +0300 @@ -15,7 +15,7 @@ #include #include "iec_types.h" -int GetRetainSize(); +int GetRetainSize(void); /* Retain buffer. */ FILE *retain_buffer; @@ -79,7 +79,7 @@ while(!feof(file_buffer)){ if (fread(&data_block, sizeof(data_block), 1, file_buffer)) - calc_crc32 = GenerateCRC32Sum(&data_block, sizeof(char), calc_crc32); + calc_crc32 = GenerateCRC32Sum(&data_block, sizeof(data_block), calc_crc32); } /* Compare crc result with a magic number. */ @@ -89,7 +89,7 @@ /* Compare current hash with hash from file byte by byte. */ int CheckFilehash(void) { - int k; + unsigned int k; int offset = sizeof(retain_info.retain_size); rewind(retain_buffer); @@ -102,7 +102,7 @@ for(k = 0; k < retain_info.hash_size; k++){ uint8_t file_digit; - fread(&file_digit, sizeof(char), 1, retain_buffer); + fread(&file_digit, sizeof(file_digit), 1, retain_buffer); if (file_digit != *(retain_info.hash+k)) return 0; } @@ -112,7 +112,7 @@ void InitRetain(void) { - int i; + unsigned int i; /* Generate CRC32 lookup table. */ GenerateCRC32Table(); @@ -249,7 +249,7 @@ /* Add retain data CRC to the end of buffer file. */ fseek(retain_buffer, 0, SEEK_END); - fwrite(&retain_crc, sizeof(uint32_t), 1, retain_buffer); + fwrite(&retain_crc, sizeof(retain_crc), 1, retain_buffer); /* Sync file buffer and close file. */ #ifdef __WIN32