generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-05-02 15:41:38 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #860 from ygj6/build

Browse Source 
fix github actions failure and use C style casts instead of C++ style casts in zbuffer.h
This commit is contained in:
Takatoshi Kondo 2020-04-16 23:38:46 +09:00 committed by GitHub
commit 102dba8e24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/gha.yml vendored
View File

@ -94,17 +94,10 @@ jobs:
pattern: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] pattern: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: install g++-multilib - name: install depends
run: |
sudo apt-get install g++-multilib
- name: install clang
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install clang-8 sudo apt-get install g++-multilib clang-8 valgrind
- name: install valgrind
run: |
sudo apt-get update
sudo apt-get install valgrind
- name: Cache boost - name: Cache boost
id: cache-boost id: cache-boost
uses: actions/cache@v1 uses: actions/cache@v1

8
include/msgpack/zbuffer.h
View File

@ -100,7 +100,7 @@ static inline void msgpack_zbuffer_free(msgpack_zbuffer* zbuf)
static inline bool msgpack_zbuffer_expand(msgpack_zbuffer* zbuf) static inline bool msgpack_zbuffer_expand(msgpack_zbuffer* zbuf)
{ {
size_t used = static_cast<size_t>(reinterpret_cast<char*>(zbuf->stream.next_out) - zbuf->data); size_t used = (size_t)((char *)(zbuf->stream.next_out) - zbuf->data);
size_t csize = used + zbuf->stream.avail_out; size_t csize = used + zbuf->stream.avail_out;
size_t nsize = (csize == 0) ? zbuf->init_size : csize * 2; size_t nsize = (csize == 0) ? zbuf->init_size : csize * 2;
@ -112,7 +112,7 @@ static inline bool msgpack_zbuffer_expand(msgpack_zbuffer* zbuf)
zbuf->data = tmp; zbuf->data = tmp;
zbuf->stream.next_out = (Bytef*)(tmp + used); zbuf->stream.next_out = (Bytef*)(tmp + used);
zbuf->stream.avail_out = static_cast<uInt>(nsize - used); zbuf->stream.avail_out = (uInt)(nsize - used);
return true; return true;
} }
@ -122,7 +122,7 @@ static inline int msgpack_zbuffer_write(void* data, const char* buf, size_t len)
msgpack_zbuffer* zbuf = (msgpack_zbuffer*)data; msgpack_zbuffer* zbuf = (msgpack_zbuffer*)data;
zbuf->stream.next_in = (Bytef*)buf; zbuf->stream.next_in = (Bytef*)buf;
zbuf->stream.avail_in = static_cast<uInt>(len); zbuf->stream.avail_in = (uInt)len;
while(zbuf->stream.avail_in > 0) { while(zbuf->stream.avail_in > 0) {
if(zbuf->stream.avail_out < MSGPACK_ZBUFFER_RESERVE_SIZE) { if(zbuf->stream.avail_out < MSGPACK_ZBUFFER_RESERVE_SIZE) {
@ -164,7 +164,7 @@ static inline const char* msgpack_zbuffer_data(const msgpack_zbuffer* zbuf)
static inline size_t msgpack_zbuffer_size(const msgpack_zbuffer* zbuf) static inline size_t msgpack_zbuffer_size(const msgpack_zbuffer* zbuf)
{ {
return static_cast<size_t>(reinterpret_cast<char*>(zbuf->stream.next_out) - zbuf->data); return (size_t)((char *)(zbuf->stream.next_out) - zbuf->data);
} }
static inline void msgpack_zbuffer_reset_buffer(msgpack_zbuffer* zbuf) static inline void msgpack_zbuffer_reset_buffer(msgpack_zbuffer* zbuf)