Skip to content

Commit

Permalink
fix: MSVC doens't support array paramters trickery
Browse files Browse the repository at this point in the history 
would have require C99 + some extension... :(
  • Loading branch information
@bsmiles32
bsmiles32 committed Jan 19, 2022
1 parent 40ffdc1 commit e4369f2
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
32 changes: 16 additions & 16 deletions src/main/util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,26 +260,26 @@ void to_big_endian_buffer(void *buffer, size_t length, size_t count)
/* Simple serialization primitives,
* Use byte access to avoid alignment issues.
*/
uint8_t load_beu8(const unsigned char ptr[static sizeof(uint8_t)])
uint8_t load_beu8(const unsigned char *ptr)
{
return (uint8_t)ptr[0];
}

uint16_t load_beu16(const unsigned char ptr[static sizeof(uint16_t)])
uint16_t load_beu16(const unsigned char *ptr)
{
return ((uint16_t)ptr[0] << 8)
| ((uint16_t)ptr[1] << 0);
}

uint32_t load_beu32(const unsigned char ptr[static sizeof(uint32_t)])
uint32_t load_beu32(const unsigned char *ptr)
{
return ((uint32_t)ptr[0] << 24)
| ((uint32_t)ptr[1] << 16)
| ((uint32_t)ptr[2] << 8)
| ((uint32_t)ptr[3] << 0);
}

uint64_t load_beu64(const unsigned char ptr[static sizeof(uint64_t)])
uint64_t load_beu64(const unsigned char *ptr)
{
return ((uint64_t)ptr[0] << 56)
| ((uint64_t)ptr[1] << 48)
Expand All @@ -292,26 +292,26 @@ uint64_t load_beu64(const unsigned char ptr[static sizeof(uint64_t)])
}


uint8_t load_leu8(const unsigned char ptr[static sizeof(uint8_t)])
uint8_t load_leu8(const unsigned char *ptr)
{
return (uint8_t)ptr[0];
}

uint16_t load_leu16(const unsigned char ptr[static sizeof(uint16_t)])
uint16_t load_leu16(const unsigned char *ptr)
{
return ((uint16_t)ptr[0] << 0)
| ((uint16_t)ptr[1] << 8);
}

uint32_t load_leu32(const unsigned char ptr[static sizeof(uint32_t)])
uint32_t load_leu32(const unsigned char *ptr)
{
return ((uint32_t)ptr[0] << 0)
| ((uint32_t)ptr[1] << 8)
| ((uint32_t)ptr[2] << 16)
| ((uint32_t)ptr[3] << 24);
}

uint64_t load_leu64(const unsigned char ptr[static sizeof(uint64_t)])
uint64_t load_leu64(const unsigned char *ptr)
{
return ((uint64_t)ptr[0] << 0)
| ((uint64_t)ptr[1] << 8)
Expand All @@ -325,26 +325,26 @@ uint64_t load_leu64(const unsigned char ptr[static sizeof(uint64_t)])



void store_beu8(uint8_t value, unsigned char ptr[static sizeof(value)])
void store_beu8(uint8_t value, unsigned char *ptr)
{
ptr[0] = (uint8_t)value;
}

void store_beu16(uint16_t value, unsigned char ptr[static sizeof(value)])
void store_beu16(uint16_t value, unsigned char *ptr)
{
ptr[0] = (uint8_t)(value >> 8);
ptr[1] = (uint8_t)(value >> 0);
}

void store_beu32(uint32_t value, unsigned char ptr[static sizeof(value)])
void store_beu32(uint32_t value, unsigned char *ptr)
{
ptr[0] = (uint8_t)(value >> 24);
ptr[1] = (uint8_t)(value >> 16);
ptr[2] = (uint8_t)(value >> 8);
ptr[3] = (uint8_t)(value >> 0);
}

void store_beu64(uint64_t value, unsigned char ptr[static sizeof(value)])
void store_beu64(uint64_t value, unsigned char *ptr)
{
ptr[0] = (uint8_t)(value >> 56);
ptr[1] = (uint8_t)(value >> 48);
Expand All @@ -357,26 +357,26 @@ void store_beu64(uint64_t value, unsigned char ptr[static sizeof(value)])
}


void store_leu8(uint8_t value, unsigned char ptr[static sizeof(value)])
void store_leu8(uint8_t value, unsigned char *ptr)
{
ptr[0] = (uint8_t)value;
}

void store_leu16(uint16_t value, unsigned char ptr[static sizeof(value)])
void store_leu16(uint16_t value, unsigned char *ptr)
{
ptr[0] = (uint8_t)(value >> 0);
ptr[1] = (uint8_t)(value >> 8);
}

void store_leu32(uint32_t value, unsigned char ptr[static sizeof(value)])
void store_leu32(uint32_t value, unsigned char *ptr)
{
ptr[0] = (uint8_t)(value >> 0);
ptr[1] = (uint8_t)(value >> 8);
ptr[2] = (uint8_t)(value >> 16);
ptr[3] = (uint8_t)(value >> 24);
}

void store_leu64(uint64_t value, unsigned char ptr[static sizeof(value)])
void store_leu64(uint64_t value, unsigned char *ptr)
{
ptr[0] = (uint8_t)(value >> 0);
ptr[1] = (uint8_t)(value >> 8);
Expand Down
38 changes: 19 additions & 19 deletions src/main/util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,25 +154,25 @@ void to_big_endian_buffer(void *buffer, size_t length, size_t count);
/* Simple serialization primitives,
* Loosely modeled after N2827 <stdbit.h> proposal.
*/
uint8_t load_beu8(const unsigned char ptr[static sizeof(uint8_t)]);
uint16_t load_beu16(const unsigned char ptr[static sizeof(uint16_t)]);
uint32_t load_beu32(const unsigned char ptr[static sizeof(uint32_t)]);
uint64_t load_beu64(const unsigned char ptr[static sizeof(uint64_t)]);

uint8_t load_leu8(const unsigned char ptr[static sizeof(uint8_t)]);
uint16_t load_leu16(const unsigned char ptr[static sizeof(uint16_t)]);
uint32_t load_leu32(const unsigned char ptr[static sizeof(uint32_t)]);
uint64_t load_leu64(const unsigned char ptr[static sizeof(uint64_t)]);

void store_beu8(uint8_t value, unsigned char ptr[static sizeof(value)]);
void store_beu16(uint16_t value, unsigned char ptr[static sizeof(value)]);
void store_beu32(uint32_t value, unsigned char ptr[static sizeof(value)]);
void store_beu64(uint64_t value, unsigned char ptr[static sizeof(value)]);

void store_leu8(uint8_t value, unsigned char ptr[static sizeof(value)]);
void store_leu16(uint16_t value, unsigned char ptr[static sizeof(value)]);
void store_leu32(uint32_t value, unsigned char ptr[static sizeof(value)]);
void store_leu64(uint64_t value, unsigned char ptr[static sizeof(value)]);
uint8_t load_beu8(const unsigned char *ptr);
uint16_t load_beu16(const unsigned char *ptr);
uint32_t load_beu32(const unsigned char *ptr);
uint64_t load_beu64(const unsigned char *ptr);

uint8_t load_leu8(const unsigned char *ptr);
uint16_t load_leu16(const unsigned char *ptr);
uint32_t load_leu32(const unsigned char *ptr);
uint64_t load_leu64(const unsigned char *ptr);

void store_beu8(uint8_t value, unsigned char *ptr);
void store_beu16(uint16_t value, unsigned char *ptr);
void store_beu32(uint32_t value, unsigned char *ptr);
void store_beu64(uint64_t value, unsigned char *ptr);

void store_leu8(uint8_t value, unsigned char *ptr);
void store_leu16(uint16_t value, unsigned char *ptr);
void store_leu32(uint32_t value, unsigned char *ptr);
void store_leu64(uint64_t value, unsigned char *ptr);


/**********************
Expand Down

0 comments on commit e4369f2

Please sign in to comment.