From b6cf68e8c79a2c655dc107944880ff5a14f09cfb Mon Sep 17 00:00:00 2001 From: qiaojbao Date: Tue, 7 Sep 2021 15:57:49 +0800 Subject: [PATCH] Merge upstream 'v1.3.1' into amd-staging (2) Change-Id: I494bca18e12a636a3a64fb1bd3c652046b7267d3 --- .gitignore | 1 - src/cwpack.c | 5 ++--- src/cwpack.h | 9 ++++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index d57298b..f350fff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ # Finder --------------------------- .DS_Store - # Explicit no GIT *.noGIT diff --git a/src/cwpack.c b/src/cwpack.c index 94b0516..66971a3 100644 --- a/src/cwpack.c +++ b/src/cwpack.c @@ -32,7 +32,7 @@ #ifdef FORCE_NO_LIBRARY -static void CWP_CALL *memcpy(void *dst, const void *src, size_t n) +static void CWP_CALL *memcpy(void *dst, const void *src, size_t n) { unsigned int i; uint8_t *d=(uint8_t*)dst, *s=(uint8_t*)src; @@ -426,6 +426,7 @@ void CWP_CALL cw_pack_time (cw_pack_context* pack_context, int64_t sec, uint32_t } } + void CWP_CALL cw_pack_insert (cw_pack_context* pack_context, const void* v, uint32_t l) { uint8_t *p; @@ -471,7 +472,6 @@ void CWP_CALL cw_unpack_next (cw_unpack_context* unpack_context) uint64_t tmpu64; uint32_t tmpu32; uint16_t tmpu16; - const uint8_t* p; #define buffer_end_return_code CWP_RC_END_OF_INPUT; @@ -606,7 +606,6 @@ void CWP_CALL cw_skip_items (cw_unpack_context* unpack_context, long item_count) uint32_t tmpu32; uint16_t tmpu16; - const uint8_t* p; while (item_count-- > 0) diff --git a/src/cwpack.h b/src/cwpack.h index 85a832d..a79c64d 100644 --- a/src/cwpack.h +++ b/src/cwpack.h @@ -31,12 +31,10 @@ extern "C" { #include #include - #ifndef CWP_CALL #define CWP_CALL #endif - /******************************* Return Codes *****************************/ #define CWP_RC_OK 0 @@ -57,6 +55,7 @@ extern "C" { /******************************* P A C K **********************************/ + struct cw_pack_context; typedef int (CWP_CALL *pack_overflow_handler)(struct cw_pack_context*, unsigned long); @@ -87,21 +86,21 @@ void CWP_CALL cw_pack_boolean (cw_pack_context* pack_context, bool b); void CWP_CALL cw_pack_signed (cw_pack_context* pack_context, int64_t i); void CWP_CALL cw_pack_unsigned (cw_pack_context* pack_context, uint64_t i); -/* void CWP_CALL cw_pack_real (cw_pack_context* pack_context, double d); moved to cwpack_utils */ void CWP_CALL cw_pack_float (cw_pack_context* pack_context, float f); void CWP_CALL cw_pack_double (cw_pack_context* pack_context, double d); -void CWP_CALL cw_pack_real (cw_pack_context* pack_context, double d); /* Pack as float if precision isn't destroyed */ -void CWP_CALL cw_pack_time (cw_pack_context* pack_context, int64_t sec, uint32_t nsec); +/* void cw_pack_real (cw_pack_context* pack_context, double d); moved to cwpack_utils */ void CWP_CALL cw_pack_array_size (cw_pack_context* pack_context, uint32_t n); void CWP_CALL cw_pack_map_size (cw_pack_context* pack_context, uint32_t n); void CWP_CALL cw_pack_str (cw_pack_context* pack_context, const char* v, uint32_t l); void CWP_CALL cw_pack_bin (cw_pack_context* pack_context, const void* v, uint32_t l); void CWP_CALL cw_pack_ext (cw_pack_context* pack_context, int8_t type, const void* v, uint32_t l); +void CWP_CALL cw_pack_time (cw_pack_context* pack_context, int64_t sec, uint32_t nsec); void CWP_CALL cw_pack_insert (cw_pack_context* pack_context, const void* v, uint32_t l); + /***************************** U N P A C K ********************************/