diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 978571d..445402b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,7 @@ jobs: - name: Checkout Code id: checkout uses: actions/checkout@v2 + run: echo ::set-output name=VERSION::$( git describe --tags --abbrev=0 ) - name: Setup Build Tools run: | diff --git a/base1432.c b/base1432.c index 4ce6019..9089ab0 100644 --- a/base1432.c +++ b/base1432.c @@ -25,7 +25,7 @@ typedef union { uint8_t buf[4]; uint32_t val; -} remainder; +} base16384_union_remainder; int base16384_encode_safe(const char* data, int dlen, char* buf) { int outlen = dlen / 7 * 8; @@ -60,7 +60,7 @@ int base16384_encode_safe(const char* data, int dlen, char* buf) { sum += 0x4e004e00; vals[n++] = be32toh(sum); } - remainder valbuf; + base16384_union_remainder valbuf; if(dlen - i == 7) { register uint32_t sum = 0; register uint32_t shift = htobe32(*(uint32_t*)(data+i)); @@ -276,7 +276,7 @@ int base16384_decode_safe(const char* data, int dlen, char* buf) { sum |= shift & 0x003fff00; *(uint32_t*)(buf+i+4) = be32toh(sum); } - remainder valbuf; + base16384_union_remainder valbuf; if(outlen - i == 7) { register uint32_t sum = 0; register uint32_t shift = htobe32(vals[n++]) - 0x4e004e00; diff --git a/base1464.c b/base1464.c index 0641f05..1cfc786 100644 --- a/base1464.c +++ b/base1464.c @@ -25,7 +25,7 @@ typedef union { uint8_t buf[8]; uint64_t val; -} remainder; +} base16384_union_remainder; int base16384_encode_safe(const char* data, int dlen, char* buf) { int outlen = dlen / 7 * 8; @@ -56,7 +56,7 @@ int base16384_encode_safe(const char* data, int dlen, char* buf) { sum += 0x4e004e004e004e00; vals[n++] = be64toh(sum); } - remainder valbuf; + base16384_union_remainder valbuf; if(dlen - i == 7) { memcpy(valbuf.buf, data+i, 7); register uint64_t sum = 0; @@ -243,7 +243,7 @@ int base16384_decode_safe(const char* data, int dlen, char* buf) { sum |= shift & 0x00000000003fff00; *(uint64_t*)(buf+i) = be64toh(sum); } - remainder valbuf; + base16384_union_remainder valbuf; if(outlen - i == 7) { register uint64_t sum = 0; register uint64_t shift = htobe64(vals[n]) - 0x4e004e004e004e00;