caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warnings about integer comparisons

Browse Source
This commit is contained in:
Hugues Delorme 2016-03-02 18:05:19 +01:00
parent 2ec351d8d3
commit ffb980ae63
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gmio_stl/stla_read.c
View File

@ -26,6 +26,7 @@
#include "../gmio_core/internal/helper_stream.h" #include "../gmio_core/internal/helper_stream.h"
#include "../gmio_core/internal/helper_task_iface.h" #include "../gmio_core/internal/helper_task_iface.h"
#include "../gmio_core/internal/min_max.h" #include "../gmio_core/internal/min_max.h"
#include "../gmio_core/internal/safe_cast.h"
#include "../gmio_core/internal/stringstream.h" #include "../gmio_core/internal/stringstream.h"
#include "../gmio_core/internal/string_ascii_utils.h" #include "../gmio_core/internal/string_ascii_utils.h"
@ -90,8 +91,10 @@ static size_t gmio_stringstream_stla_read(
(struct gmio_stringstream_stla_cookie*)(cookie); (struct gmio_stringstream_stla_cookie*)(cookie);
if (stlac != NULL) { if (stlac != NULL) {
const struct gmio_task_iface* task = stlac->task; const struct gmio_task_iface* task = stlac->task;
const size_t to_read = const size_t remaining_contents_size =
GMIO_MIN(len, stlac->stream_size - stlac->stream_offset + 1); gmio_streamsize_to_size(
stlac->stream_size - stlac->stream_offset + 1);
const size_t to_read = GMIO_MIN(len, remaining_contents_size);
const size_t len_read = gmio_stream_read_bytes(stream, ptr, to_read); const size_t len_read = gmio_stream_read_bytes(stream, ptr, to_read);
stlac->stream_offset += len_read; stlac->stream_offset += len_read;
stlac->is_stop_requested = gmio_task_iface_is_stop_requested(task); stlac->is_stop_requested = gmio_task_iface_is_stop_requested(task);

5
tests/test_stl_infos.c
View File

@ -73,6 +73,7 @@ const char* generic_test_stl_infos(const struct gmio_test_stl_infos* test)
if (test->format == GMIO_STL_FORMAT_ASCII) { if (test->format == GMIO_STL_FORMAT_ASCII) {
const size_t name_len = strlen(stla_solid_name); const size_t name_len = strlen(stla_solid_name);
const gmio_streamsize_t name_len_ssize = name_len;
#if 0 #if 0
printf("expected_size=%d " printf("expected_size=%d "
"name_len=%d " "name_len=%d "
@ -80,8 +81,8 @@ const char* generic_test_stl_infos(const struct gmio_test_stl_infos* test)
"infos.solid_name=%s\n", "infos.solid_name=%s\n",
expected_size, name_len, infos.size, infos.stla_solidname); expected_size, name_len, infos.size, infos.stla_solidname);
#endif #endif
UTEST_ASSERT((expected_size - name_len) <= infos.size); UTEST_ASSERT((expected_size - name_len_ssize) <= infos.size);
UTEST_ASSERT(infos.size <= (expected_size + name_len)); UTEST_ASSERT(infos.size <= (expected_size + name_len_ssize));
} }
else { else {
UTEST_COMPARE_INT(expected_size, infos.size); UTEST_COMPARE_INT(expected_size, infos.size);