Skip to content

Commit 8f19dd9

Browse files
author
DESKTOP-O8FHBKJ\Leo
committed
addressed warnings when under MSVC
1 parent 86c3262 commit 8f19dd9

File tree

7 files changed

+753
-745
lines changed

7 files changed

+753
-745
lines changed

framework/modules/saf_sofa_reader/libmysofa/internal/hdf_dataobject.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ static int readOHDRHeaderMessageDatatype(struct READER *reader,
248248

249249
switch (dt->class_and_version & 0xf) {
250250
case 0: /* int */
251-
dt->u.i.bit_offset = readValue(reader, 2);
252-
dt->u.i.bit_precision = readValue(reader, 2);
251+
dt->u.i.bit_offset = (uint16_t)readValue(reader, 2);
252+
dt->u.i.bit_precision = (uint16_t)readValue(reader, 2);
253253
mylog(" INT bit %d %d %d %d\n", dt->u.i.bit_offset,
254254
dt->u.i.bit_precision, dt->class_and_version >> 4, dt->size);
255255
break;
@@ -527,7 +527,7 @@ static int readOHDRHeaderMessageDataLayout(struct READER *reader,
527527

528528
if (validAddress(reader, data_address)) {
529529
store = ftell(reader->fhd);
530-
if (fseek(reader->fhd, data_address, SEEK_SET) < 0)
530+
if (fseek(reader->fhd, (long)data_address, SEEK_SET) < 0)
531531
return errno; // LCOV_EXCL_LINE
532532
if (!data->data) {
533533
if (data_size > 0x10000000)
@@ -540,7 +540,7 @@ static int readOHDRHeaderMessageDataLayout(struct READER *reader,
540540
err = (int)fread(data->data, 1, data_size, reader->fhd);
541541
if (err != (int)data_size)
542542
return MYSOFA_READ_ERROR; // LCOV_EXCL_LINE
543-
if (fseek(reader->fhd, store, SEEK_SET) < 0)
543+
if (fseek(reader->fhd, (long)store, SEEK_SET) < 0)
544544
return errno; // LCOV_EXCL_LINE
545545
}
546546
break;
@@ -565,11 +565,11 @@ static int readOHDRHeaderMessageDataLayout(struct READER *reader,
565565

566566
size = data->datalayout_chunk[dimensionality - 1];
567567
for (i = 0; i < data->ds.dimensionality; i++)
568-
size *= data->ds.dimension_size[i];
568+
size *= (unsigned int)data->ds.dimension_size[i];
569569

570570
if (validAddress(reader, data_address) && dimensionality <= 4) {
571571
store = ftell(reader->fhd);
572-
if (fseek(reader->fhd, data_address, SEEK_SET) < 0)
572+
if (fseek(reader->fhd, (long)data_address, SEEK_SET) < 0)
573573
return errno; // LCOV_EXCL_LINE
574574
if (!data->data) {
575575
if (size > 0x10000000)
@@ -582,7 +582,7 @@ static int readOHDRHeaderMessageDataLayout(struct READER *reader,
582582
err = treeRead(reader, data);
583583
if (err)
584584
return err; // LCOV_EXCL_LINE
585-
if (fseek(reader->fhd, store, SEEK_SET) < 0)
585+
if (fseek(reader->fhd, (long)store, SEEK_SET) < 0)
586586
return errno; // LCOV_EXCL_LINE
587587
}
588588
break;
@@ -924,7 +924,7 @@ static int readOHDRHeaderMessageContinue(struct READER *reader,
924924

925925
store = ftell(reader->fhd);
926926

927-
if (fseek(reader->fhd, offset, SEEK_SET) < 0)
927+
if (fseek(reader->fhd, (long)offset, SEEK_SET) < 0)
928928
return errno; // LCOV_EXCL_LINE
929929

930930
err = readOCHK(reader, dataobject, offset + length);
@@ -1186,7 +1186,7 @@ static int readOHDRmessages(struct READER *reader,
11861186
}
11871187
}
11881188

1189-
if (fseek(fhd, end_of_messages + 4, SEEK_SET) < 0) /* skip checksum */
1189+
if (fseek(fhd, (long)end_of_messages + 4, SEEK_SET) < 0) /* skip checksum */
11901190
return errno;
11911191

11921192
return MYSOFA_OK;
@@ -1269,7 +1269,7 @@ int dataobjectRead(struct READER *reader, struct DATAOBJECT *dataobject,
12691269

12701270
/* parse message attribute info */
12711271
if (validAddress(reader, dataobject->ai.fractal_heap_address)) {
1272-
if (fseek(reader->fhd, dataobject->ai.fractal_heap_address, SEEK_SET) < 0)
1272+
if (fseek(reader->fhd, (long)dataobject->ai.fractal_heap_address, SEEK_SET) < 0)
12731273
return errno;
12741274
err = fractalheapRead(reader, dataobject, &dataobject->attributes_heap);
12751275
if (err)
@@ -1278,7 +1278,7 @@ int dataobjectRead(struct READER *reader, struct DATAOBJECT *dataobject,
12781278

12791279
/* parse message link info */
12801280
if (validAddress(reader, dataobject->li.fractal_heap_address)) {
1281-
fseek(reader->fhd, dataobject->li.fractal_heap_address, SEEK_SET);
1281+
fseek(reader->fhd, (long)dataobject->li.fractal_heap_address, SEEK_SET);
12821282
err = fractalheapRead(reader, dataobject, &dataobject->objects_heap);
12831283
if (err)
12841284
return err;

framework/modules/saf_sofa_reader/libmysofa/internal/hdf_fractalhead.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
#define MAX_NAME_LENGTH (0x100)
4646

47-
static int log2i(int a) { return round(log2(a)); }
47+
static int log2i(int a) { return (int)round(log2(a)); }
4848

4949
static int directblockRead(struct READER *reader, struct DATAOBJECT *dataobject,
5050
struct FRACTALHEAP *fractalheap) {
@@ -95,11 +95,11 @@ static int directblockRead(struct READER *reader, struct DATAOBJECT *dataobject,
9595
if (fseek(reader->fhd, 4, SEEK_CUR))
9696
return errno; // LCOV_EXCL_LINE
9797

98-
offset_size = ceilf(log2f(fractalheap->maximum_heap_size) / 8);
98+
offset_size = (int)ceilf(log2f(fractalheap->maximum_heap_size) / 8);
9999
if (fractalheap->maximum_direct_block_size < fractalheap->maximum_size)
100-
length_size = ceilf(log2f(fractalheap->maximum_direct_block_size) / 8);
100+
length_size = (int)ceilf(log2f((float)fractalheap->maximum_direct_block_size) / 8);
101101
else
102-
length_size = ceilf(log2f(fractalheap->maximum_size) / 8);
102+
length_size = (int)ceilf(log2f((float)fractalheap->maximum_size) / 8);
103103

104104
mylog(" %d %" PRIu64 " %d\n", size, block_offset, offset_size);
105105

@@ -260,7 +260,7 @@ static int directblockRead(struct READER *reader, struct DATAOBJECT *dataobject,
260260
dataobject->directory = dir;
261261

262262
store = ftell(reader->fhd);
263-
if (fseek(reader->fhd, heap_header_address, SEEK_SET)) {
263+
if (fseek(reader->fhd, (long)heap_header_address, SEEK_SET)) {
264264
free(name); // LCOV_EXCL_LINE
265265
return errno; // LCOV_EXCL_LINE
266266
}
@@ -509,7 +509,7 @@ static int indirectblockRead(struct READER *reader,
509509
mylog(">> %d %" PRIX64 " %d\n", k, child_direct_block, size);
510510
if (validAddress(reader, child_direct_block)) {
511511
store = ftell(reader->fhd);
512-
if (fseek(reader->fhd, child_direct_block, SEEK_SET) < 0)
512+
if (fseek(reader->fhd, (long)child_direct_block, SEEK_SET) < 0)
513513
return errno;
514514
err = directblockRead(reader, dataobject, fractalheap);
515515
if (err)
@@ -529,7 +529,7 @@ static int indirectblockRead(struct READER *reader,
529529

530530
if (validAddress(reader, child_direct_block)) {
531531
store = ftell(reader->fhd);
532-
if (fseek(reader->fhd, child_indirect_block, SEEK_SET) < 0)
532+
if (fseek(reader->fhd, (long)child_indirect_block, SEEK_SET) < 0)
533533
return errno;
534534
err = indirectblockRead(reader, dataobject, fractalheap, iblock_size * 2);
535535
if (err)
@@ -658,7 +658,7 @@ int fractalheapRead(struct READER *reader, struct DATAOBJECT *dataobject,
658658

659659
if (validAddress(reader, fractalheap->address_of_root_block)) {
660660

661-
if (fseek(reader->fhd, fractalheap->address_of_root_block, SEEK_SET) < 0)
661+
if (fseek(reader->fhd, (long)fractalheap->address_of_root_block, SEEK_SET) < 0)
662662
return errno;
663663
if (fractalheap->current_row)
664664
err = indirectblockRead(reader, dataobject, fractalheap,

0 commit comments

Comments
 (0)