Skip to content

Commit 2c80ebd

Browse files
committed
ccan: merge upstream base64 warning fixes
1 parent 8b33420 commit 2c80ebd

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/ccan/ccan/base64/base64.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static int8_t sixbit_from_b64(const base64_maps_t *maps,
3434
int8_t ret;
3535

3636
ret = maps->decode_map[(unsigned char)b64letter];
37-
if (ret == '\xff') {
37+
if (ret == (int8_t)'\xff') {
3838
errno = EDOM;
3939
return -1;
4040
}
@@ -44,7 +44,7 @@ static int8_t sixbit_from_b64(const base64_maps_t *maps,
4444

4545
bool base64_char_in_alphabet(const base64_maps_t *maps, const char b64char)
4646
{
47-
return (maps->decode_map[(const unsigned char)b64char] != '\xff');
47+
return (maps->decode_map[(const unsigned char)b64char] != (signed char)'\xff');
4848
}
4949

5050
void base64_init_maps(base64_maps_t *dest, const char src[64])

src/ccan/ccan/base64/base64.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ ssize_t base64_decode_quartet_using_maps(const base64_maps_t *maps,
118118
* @note sets errno = EDOM if src contains invalid characters
119119
* @note sets errno = EINVAL if src is an invalid base64 tail
120120
*/
121-
ssize_t base64_decode_tail_using_maps(const base64_maps_t *maps, char *dest,
121+
ssize_t base64_decode_tail_using_maps(const base64_maps_t *maps, char dest[3],
122122
const char *src, size_t srclen);
123123

124124

@@ -214,7 +214,7 @@ ssize_t base64_decode(char *dest, size_t destlen,
214214
* @note sets errno = EDOM if src contains invalid characters
215215
*/
216216
static inline
217-
int base64_decode_quartet(char dest[3], const char src[4])
217+
ssize_t base64_decode_quartet(char dest[3], const char src[4])
218218
{
219219
return base64_decode_quartet_using_maps(&base64_maps_rfc4648,
220220
dest, src);

0 commit comments

Comments
 (0)