mleku/libbase58
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address most LLVM warnings

Browse Source
This commit is contained in:
Luke Dashjr
2014-09-16 02:40:45 +00:00
parent 6d2d2c5f0e
commit fa132f17c4
2 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
base58.c
View File

@@ -16,6 +16,8 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "libbase58.h"
bool (*b58_sha256_impl)(void *, const void *, size_t) = NULL; bool (*b58_sha256_impl)(void *, const void *, size_t) = NULL;
static const int8_t b58digits_map[] = { static const int8_t b58digits_map[] = {
@@ -60,7 +62,7 @@ bool b58tobin(void *bin, size_t *binszp, const char *b58, size_t b58sz)
if (b58digits_map[b58u[i]] == -1) if (b58digits_map[b58u[i]] == -1)
// Invalid base58 digit // Invalid base58 digit
return false; return false;
c = b58digits_map[b58u[i]]; c = (unsigned)b58digits_map[b58u[i]];
for (j = outisz; j--; ) for (j = outisz; j--; )
{ {
t = ((uint64_t)outi[j]) * 58 + c; t = ((uint64_t)outi[j]) * 58 + c;
@@ -90,10 +92,10 @@ bool b58tobin(void *bin, size_t *binszp, const char *b58, size_t b58sz)
for (; j < outisz; ++j) for (; j < outisz; ++j)
{ {
*(binu++) = outi[j] >> 0x18; *(binu++) = (outi[j] >> 0x18) & 0xff;
*(binu++) = outi[j] >> 0x10; *(binu++) = (outi[j] >> 0x10) & 0xff;
*(binu++) = outi[j] >> 8; *(binu++) = (outi[j] >> 8) & 0xff;
*(binu++) = outi[j]; *(binu++) = (outi[j] >> 0) & 0xff;
} }
// Count canonical base58 byte count // Count canonical base58 byte count
@@ -142,7 +144,8 @@ static const char b58digits_ordered[] = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdef
bool b58enc(char *b58, size_t *b58sz, const void *data, size_t binsz) bool b58enc(char *b58, size_t *b58sz, const void *data, size_t binsz)
{ {
const uint8_t *bin = data; const uint8_t *bin = data;
int i, j, carry, high, zcount = 0; int carry;
size_t i, j, high, zcount = 0;
size_t size; size_t size;
while (zcount < binsz && !bin[zcount]) while (zcount < binsz && !bin[zcount])

41
clitool.c
View File

@@ -36,7 +36,7 @@ void usage(const char *prog)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
bool b58c = false; bool b58c = false;
int decode = 0; size_t decode = 0;
int opt; int opt;
while ( (opt = getopt(argc, argv, "cd:h")) != -1) while ( (opt = getopt(argc, argv, "cd:h")) != -1)
{ {
@@ -47,34 +47,39 @@ int main(int argc, char **argv)
b58_sha256_impl = my_sha256; b58_sha256_impl = my_sha256;
break; break;
case 'd': case 'd':
decode = atoi(optarg); {
int i = atoi(optarg);
if (i < 0 || (uintmax_t)i >= SIZE_MAX)
usage(argv[0]);
decode = (size_t)i;
break; break;
}
default: default:
usage(argv[0]); usage(argv[0]);
} }
} }
size_t rt; size_t rt;
void *r; union {
uint8_t *b;
char *s;
} r;
if (optind >= argc) if (optind >= argc)
{ {
rt = 0; rt = 0;
r = NULL; r.b = NULL;
while (!feof(stdin)) while (!feof(stdin))
{ {
r = realloc(r, rt + 0x100); r.b = realloc(r.b, rt + 0x100);
rt += fread(r + rt, 1, 0x100, stdin); rt += fread(&r.b[rt], 1, 0x100, stdin);
} }
if (decode) if (decode)
{ while (isspace(r.s[rt-1]))
char *rs = r;
while (isspace(rs[rt-1]))
--rt; --rt;
}
} }
else else
{ {
r = argv[optind]; r.s = argv[optind];
rt = strlen(argv[optind]); rt = strlen(argv[optind]);
} }
@@ -82,11 +87,11 @@ int main(int argc, char **argv)
{ {
uint8_t bin[decode]; uint8_t bin[decode];
size_t ssz = decode; size_t ssz = decode;
if (!b58tobin(bin, &ssz, r, rt)) if (!b58tobin(bin, &ssz, r.s, rt))
return 2; return 2;
if (b58c) if (b58c)
{ {
int chk = b58check(bin, decode, r, rt); int chk = b58check(bin, decode, r.s, rt);
if (chk < 0) if (chk < 0)
return chk; return chk;
if (fwrite(bin, decode, 1, stdout) != 1) if (fwrite(bin, decode, 1, stdout) != 1)
@@ -115,15 +120,11 @@ int main(int argc, char **argv)
char s[ssz]; char s[ssz];
bool rv; bool rv;
if (b58c) if (b58c)
{ rv = rt && b58check_enc(s, &ssz, r.b[0], &r.b[1], rt-1);
uint8_t *verbyte = r;
r += 1;
rv = rt && b58check_enc(s, &ssz, *verbyte, r, rt-1);
}
else else
rv = b58enc(s, &ssz, r, rt); rv = b58enc(s, &ssz, r.b, rt);
if (!rv) if (!rv)
return 2; return 2;
puts(s); puts(s);
} }
} }