thepigeongenerator/mcaselector-lite
1
0
Fork 0
mirror of https://github.com/thepigeongenerator/mcaselector-lite synced 2026-02-07 23:28:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix the simple semantic type issues.

Browse Source 
Fixed all the simple issues when it came to type semantics. The
remaining warnings/errors are near buggy / poor quality code, and need a
finer comb to resolve.
This commit is contained in:
Quinn
2026-01-22 16:14:25 +01:00
parent dae2c5bda4
commit d79fec3f91
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/dat/mcx.c
View File

@@ -29,13 +29,13 @@ enum mcx_compression {
}; };
/* first 4 bytes is an s32 indicating remaining bytes, the following byte defines the compression scheme */ /* first 4 bytes is an s32 indicating remaining bytes, the following byte defines the compression scheme */
static int mcx_loadchunk(const u8 *restrict buf, const s32 *restrict table, int idx) static int mcx_loadchunk(const u8 *restrict buf, const be32 *restrict table, int idx)
{ {
const u8 *chunk = buf + (cvt_be32toh(table[idx]) >> 8) * SECTOR; const u8 *chunk = buf + (cvt_be32toh(table[idx]) >> 8) * SECTOR;
s32 len; be32 tmp;
memcpy(&len, chunk, 4); memcpy(&tmp, chunk, 4);
len = cvt_be32toh(len); s32 len = cvt_be32toh(tmp);
chunk += 4; chunk += 4;
struct archive *archive = archive_read_new(); struct archive *archive = archive_read_new();
@@ -77,17 +77,20 @@ static int mcx_loadchunk(const u8 *restrict buf, const s32 *restrict table, int
} }
/* Moves chunks `src_s` to `src_e` (inclusive) from `src`, back onto `dst`. */ /* Moves chunks `src_s` to `src_e` (inclusive) from `src`, back onto `dst`. */
static void mvchunks(u8 *dst, u8 *src, u32 *restrict table, int src_s, int src_e) static void mvchunks(u8 *dst, u8 *src, be32 *restrict table, int src_s, int src_e)
{ {
assert(src > dst); assert(src > dst);
uintptr len = src - dst; // acquire the amount of bytes that we shall move uintptr len = src - dst; // acquire the amount of bytes that we shall move
assert(!(len % SECTOR)); assert(!(len % SECTOR));
// count how many bytes we need to move, whilst updating location data // count how many bytes we need to move, whilst updating location data
u32 tmp;
usize blen = 0; usize blen = 0;
for (src_s++; src_s <= src_e; src_s++) { for (src_s++; src_s <= src_e; src_s++) {
blen += (cvt_be32toh(table[src_s]) & 0xFF) * SECTOR; tmp = cvt_be32toh(table[src_s]);
table[src_s] -= cvt_htobe32((len / SECTOR) << 8); blen += (tmp & 0xFF) * SECTOR;
tmp -= (len / SECTOR) << 8;
table[src_s] = cvt_htobe32(tmp);
} }
memmove(dst, src, blen); memmove(dst, src, blen);
} }
@@ -95,13 +98,13 @@ static void mvchunks(u8 *dst, u8 *src, u32 *restrict table, int src_s, int src_e
/* Deletes chunk `sidx` by moving chunks up to `eidx` back over `sidx` in `buf`. /* Deletes chunk `sidx` by moving chunks up to `eidx` back over `sidx` in `buf`.
* `rmb` is an optional additional offset that can be applied, and signifies bytes already removed. * `rmb` is an optional additional offset that can be applied, and signifies bytes already removed.
* Returns the bytes removed by this function. */ * Returns the bytes removed by this function. */
static usize delchunk(u8 *restrict buf, u32 *restrict table, usize rmb, int sidx, int eidx) static usize delchunk(u8 *restrict buf, be32 *restrict table, usize rmb, int sidx, int eidx)
{ {
// load the table data // load the table data
usize slen, bidx, blen; usize slen, bidx, blen;
slen = cvt_be32toh(table[sidx]) & 0xFF; // acquire the sector length of the chunk slen = cvt_be32toh(table[sidx]) & 0xFF; // acquire the sector length of the chunk
bidx = (cvt_be32toh(table[sidx]) >> 8) * SECTOR; // acquire and compute the byte offset the chunk starts at bidx = (cvt_be32toh(table[sidx]) >> 8) * SECTOR; // acquire and compute the byte offset the chunk starts at
blen = slen * SECTOR; // compute the byte length of the chunk blen = slen * SECTOR; // compute the byte length of the chunk
// reset the table data // reset the table data
table[sidx] = 0; table[sidx] = 0;
@@ -119,7 +122,7 @@ static usize delchunk(u8 *restrict buf, u32 *restrict table, usize rmb, int sidx
* `delchunk` requests more specific parameters, which is confusing outside this module. */ * `delchunk` requests more specific parameters, which is confusing outside this module. */
usize mcx_delchunk(u8 *restrict buf, int chunk) usize mcx_delchunk(u8 *restrict buf, int chunk)
{ {
u32 table[TABLE]; be32 table[TABLE];
memcpy(table, buf, sizeof(table)); memcpy(table, buf, sizeof(table));
usize res = delchunk(buf, table, 0, chunk, CHUNKS); usize res = delchunk(buf, table, 0, chunk, CHUNKS);
memcpy(buf, table, sizeof(table)); memcpy(buf, table, sizeof(table));
@@ -129,14 +132,14 @@ usize mcx_delchunk(u8 *restrict buf, int chunk)
usize mcx_delchunk_range(u8 *restrict buf, int start, int end) usize mcx_delchunk_range(u8 *restrict buf, int start, int end)
{ {
assert(start < end && end < CHUNKS); assert(start < end && end < CHUNKS);
u32 table[TABLE]; be32 table[TABLE];
memcpy(table, buf, sizeof(table)); memcpy(table, buf, sizeof(table));
u8 *dst = buf + (cvt_be32toh(table[start]) >> 8) * SECTOR; u8 *dst = buf + (cvt_be32toh(table[start]) >> 8) * SECTOR;
u8 *src = buf + (cvt_be32toh(table[end]) >> 8) * SECTOR; u8 *src = buf + (cvt_be32toh(table[end]) >> 8) * SECTOR;
src += (cvt_be32toh(table[end]) & 0xFF) * SECTOR; src += (cvt_be32toh(table[end]) & 0xFF) * SECTOR;
// zeroes-out the chunk data within this range. (and set the timestamp) // zeroes-out the chunk data within this range. (and set the timestamp)
u32 ts = cvt_htobe32(time(NULL)); be32 ts = cvt_htobe32(time(NULL));
for (int i = start; i <= end; i++) { for (int i = start; i <= end; i++) {
table[i] = 0; table[i] = 0;
table[i + CHUNKS] = ts; table[i + CHUNKS] = ts;

12
src/dat/nbt.c
View File

@@ -17,7 +17,7 @@
/* Extracts a big endian 16 bit integer from address `buf`, converts it to host byte size if needed and returns. */ /* Extracts a big endian 16 bit integer from address `buf`, converts it to host byte size if needed and returns. */
static inline u16 buftoh16(const void *restrict buf) static inline u16 buftoh16(const void *restrict buf)
{ {
u16 i; be16 i;
memcpy(&i, buf, sizeof(i)); memcpy(&i, buf, sizeof(i));
return cvt_be16toh(i); return cvt_be16toh(i);
} }
@@ -25,7 +25,7 @@ static inline u16 buftoh16(const void *restrict buf)
/* Extracts a big endian 32 bit integer from address `buf`, converts it to host byte size if needed and returns. */ /* Extracts a big endian 32 bit integer from address `buf`, converts it to host byte size if needed and returns. */
static inline u32 buftoh32(const void *restrict buf) static inline u32 buftoh32(const void *restrict buf)
{ {
u32 i; be32 i;
memcpy(&i, buf, sizeof(i)); memcpy(&i, buf, sizeof(i));
return cvt_be32toh(i); return cvt_be32toh(i);
} }
@@ -33,7 +33,7 @@ static inline u32 buftoh32(const void *restrict buf)
/* Extracts a big endian 64 bit integer from address `buf`, converts it to host byte size if needed and returns. */ /* Extracts a big endian 64 bit integer from address `buf`, converts it to host byte size if needed and returns. */
static inline u64 buftoh64(const void *restrict buf) static inline u64 buftoh64(const void *restrict buf)
{ {
u64 i; be64 i;
memcpy(&i, buf, sizeof(i)); memcpy(&i, buf, sizeof(i));
return cvt_be64toh(i); return cvt_be64toh(i);
} }
@@ -89,9 +89,9 @@ static const u8 *proclist(const u8 *restrict buf, struct nbt_array *restrict out
} }
buf++; buf++;
s32 len; be32 tmp;
memcpy(&len, buf, 4); memcpy(&tmp, buf, 4);
len = cvt_be32toh(len); s32 len = cvt_be32toh(tmp);
buf += 4; buf += 4;
return procarr(buf, len, size, out); return procarr(buf, len, size, out);
} }