diff options
| author | Philip Withnall <pwithnall@endlessos.org> | 2021-01-04 11:32:16 +0000 |
|---|---|---|
| committer | Philip Withnall <pwithnall@endlessos.org> | 2021-01-04 11:32:16 +0000 |
| commit | 3d50fe28e8e8f8b215a36581c6b4c9b199b60eb6 (patch) | |
| tree | 88c724d37fde1ce6492ebf27cf2e010eaefd5c4b | |
| parent | 03cf620f1b5e88dd5ebf1c87afe81764708caae0 (diff) | |
| parent | 1b6fa560b0e64b37108544b7aa493e6698e609b5 (diff) | |
| download | gvdb-3d50fe28e8e8f8b215a36581c6b4c9b199b60eb6.tar.gz | |
Merge remote-tracking branch 'fmartinsons/1735-fix-warnings'
| -rw-r--r-- | gvdb-builder.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gvdb-builder.c b/gvdb-builder.c index b8ecbe3..918ee43 100644 --- a/gvdb-builder.c +++ b/gvdb-builder.c @@ -206,7 +206,7 @@ item_to_index (GvdbItem *item) if (item != NULL) return item->assigned_index; - return guint32_to_le (-1u); + return guint32_to_le ((guint32) -1); } typedef struct @@ -234,7 +234,7 @@ file_builder_allocate (FileBuilder *fb, if (size == 0) return NULL; - fb->offset += (-fb->offset) & (alignment - 1); + fb->offset += (guint64) (-fb->offset) & (alignment - 1); chunk = g_slice_new (FileChunk); chunk->offset = fb->offset; chunk->size = size; @@ -463,9 +463,11 @@ static GString * file_builder_serialise (FileBuilder *fb, struct gvdb_pointer root) { - struct gvdb_header header = { { 0, }, }; + struct gvdb_header header; GString *result; + memset (&header, 0, sizeof (header)); + if (fb->byteswap) { header.signature[0] = GVDB_SWAPPED_SIGNATURE0; |