Skip to content

Commit

Permalink
ccan: import udpated version (with better tal_dump() format).
Browse files Browse the repository at this point in the history
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
rustyrussell committed Nov 27, 2021
1 parent a9e261f commit 8b348a5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion ccan/README
@@ -1,3 +1,3 @@
CCAN imported from http://ccodearchive.net.

CCAN version: init-2519-gcc888f28
CCAN version: init-2520-gca7c5a9e
6 changes: 3 additions & 3 deletions ccan/ccan/base64/base64.c
Expand Up @@ -118,7 +118,7 @@ size_t base64_decoded_length(size_t srclen)
return ((srclen+3)/4*3);
}

int base64_decode_quartet_using_maps(const base64_maps_t *maps, char dest[3],
ssize_t base64_decode_quartet_using_maps(const base64_maps_t *maps, char dest[3],
const char src[4])
{
signed char a;
Expand All @@ -143,7 +143,7 @@ int base64_decode_quartet_using_maps(const base64_maps_t *maps, char dest[3],
}


int base64_decode_tail_using_maps(const base64_maps_t *maps, char dest[3],
ssize_t base64_decode_tail_using_maps(const base64_maps_t *maps, char dest[3],
const char * src, const size_t srclen)
{
char longsrc[4];
Expand Down Expand Up @@ -178,7 +178,7 @@ ssize_t base64_decode_using_maps(const base64_maps_t *maps,
{
ssize_t dest_offset = 0;
ssize_t i;
size_t more;
ssize_t more;

if (destlen < base64_decoded_length(srclen)) {
errno = EOVERFLOW;
Expand Down
10 changes: 5 additions & 5 deletions ccan/ccan/base64/base64.h
Expand Up @@ -103,8 +103,8 @@ ssize_t base64_decode_using_maps(const base64_maps_t *maps,
* @return Number of decoded bytes set in dest. -1 on error (and errno set)
* @note sets errno = EDOM if src contains invalid characters
*/
int base64_decode_quartet_using_maps(const base64_maps_t *maps,
char dest[3], const char src[4]);
ssize_t base64_decode_quartet_using_maps(const base64_maps_t *maps,
char dest[3], const char src[4]);

/**
* base64_decode_tail_using_maps - decode the final bytes of a base64 string using a specific alphabet
Expand All @@ -116,8 +116,8 @@ int base64_decode_quartet_using_maps(const base64_maps_t *maps,
* @note sets errno = EDOM if src contains invalid characters
* @note sets errno = EINVAL if src is an invalid base64 tail
*/
int base64_decode_tail_using_maps(const base64_maps_t *maps, char *dest,
const char *src, size_t srclen);
ssize_t base64_decode_tail_using_maps(const base64_maps_t *maps, char *dest,
const char *src, size_t srclen);


/* the rfc4648 functions: */
Expand Down Expand Up @@ -212,7 +212,7 @@ ssize_t base64_decode(char *dest, size_t destlen,
* @note sets errno = EDOM if src contains invalid characters
*/
static inline
int base64_decode_quartet(char dest[3], const char src[4])
ssize_t base64_decode_quartet(char dest[3], const char src[4])
{
return base64_decode_quartet_using_maps(&base64_maps_rfc4648,
dest, src);
Expand Down
2 changes: 1 addition & 1 deletion ccan/ccan/tal/tal.c
Expand Up @@ -837,7 +837,7 @@ static void dump_node(unsigned int indent, const struct tal_hdr *t)
switch (p->type) {
case CHILDREN:
c = (struct children *)p;
fprintf(stderr, " CHILDREN(%p):parent=%p,children={%p,%p}\n",
fprintf(stderr, " CHILDREN(%p):parent=%p,children={%p,%p}",
p, c->parent,
c->children.n.prev, c->children.n.next);
break;
Expand Down

0 comments on commit 8b348a5

Please sign in to comment.