Cool_Tools/bemanitools
1
0
Fork 0
mirror of https://github.com/djhackersdev/bemanitools.git synced 2025-01-31 20:15:20 +01:00
Code Releases Activity

refactor(p3io/frame): Lift magic numbers to macro

Browse Source 
Aligns the code with other ACIO code where the
init and escape chars have proper macros to
improve readability
This commit is contained in:
icex2 2023-06-11 16:50:35 +02:00 committed by icex2
parent f2628a954c
commit ed0ce2de35
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/p3io/frame.c
View File

@ -8,6 +8,9 @@
#include "util/iobuf.h" #include "util/iobuf.h"
#include "util/log.h" #include "util/log.h"
#define P3IO_FRAME_SOF 0xAA
#define P3IO_FRAME_ESCAPE 0xFF
HRESULT HRESULT
p3io_frame_encode(struct iobuf *dest, const void *ptr, size_t nbytes) p3io_frame_encode(struct iobuf *dest, const void *ptr, size_t nbytes)
{ {
@ -24,17 +27,17 @@ p3io_frame_encode(struct iobuf *dest, const void *ptr, size_t nbytes)
goto trunc; goto trunc;
} }
dest->bytes[dest->pos++] = 0xAA; dest->bytes[dest->pos++] = P3IO_FRAME_SOF;
for (i = 0; i < nbytes; i++) { for (i = 0; i < nbytes; i++) {
b = bytes[i]; b = bytes[i];
if (b == 0xAA || b == 0xFF) { if (b == P3IO_FRAME_SOF || b == P3IO_FRAME_ESCAPE) {
if (dest->pos + 1 >= dest->nbytes) { if (dest->pos + 1 >= dest->nbytes) {
goto trunc; goto trunc;
} }
dest->bytes[dest->pos++] = 0xFF; dest->bytes[dest->pos++] = P3IO_FRAME_ESCAPE;
dest->bytes[dest->pos++] = ~b; dest->bytes[dest->pos++] = ~b;
} else { } else {
if (dest->pos >= dest->nbytes) { if (dest->pos >= dest->nbytes) {
@ -64,7 +67,7 @@ p3io_frame_decode(struct iobuf *dest, struct const_iobuf *src)
log_assert(dest != NULL); log_assert(dest != NULL);
log_assert(src != NULL); log_assert(src != NULL);
if (src->pos >= src->nbytes || src->bytes[src->pos] != 0xAA) { if (src->pos >= src->nbytes || src->bytes[src->pos] != P3IO_FRAME_SOF) {
return E_FAIL; return E_FAIL;
} }
@ -78,9 +81,9 @@ p3io_frame_decode(struct iobuf *dest, struct const_iobuf *src)
b = src->bytes[src->pos++]; b = src->bytes[src->pos++];
if (b == 0xAA) { if (b == P3IO_FRAME_SOF) {
return E_FAIL; return E_FAIL;
} else if (b == 0xFF) { } else if (b == P3IO_FRAME_ESCAPE) {
if (escape) { if (escape) {
return E_FAIL; return E_FAIL;
} }