Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nettle
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Brian Smith
nettle
Commits
86fdb2ce
Commit
86fdb2ce
authored
Apr 26, 2013
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use size_t rather than unsigned for base16, base64, nettle_bufer and sexp related functions.
parent
eb7c996e
Changes
23
Show whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
173 additions
and
164 deletions
+173
-164
base16-decode.c
base16-decode.c
+5
-5
base16-encode.c
base16-encode.c
+3
-3
base16-meta.c
base16-meta.c
+18
-11
base16.h
base16.h
+3
-3
base64-decode.c
base64-decode.c
+4
-4
base64-encode.c
base64-encode.c
+8
-8
base64-meta.c
base64-meta.c
+6
-4
base64.h
base64.h
+7
-7
buffer.c
buffer.c
+5
-5
buffer.h
buffer.h
+6
-6
examples/base16dec.c
examples/base16dec.c
+25
-25
examples/base64dec.c
examples/base64dec.c
+1
-1
nettle-types.h
nettle-types.h
+8
-8
sexp-format.c
sexp-format.c
+20
-20
sexp-transport-format.c
sexp-transport-format.c
+6
-6
sexp-transport.c
sexp-transport.c
+5
-5
sexp.c
sexp.c
+5
-5
sexp.h
sexp.h
+15
-15
testsuite/base64-test.c
testsuite/base64-test.c
+1
-1
testsuite/sexp-format-test.c
testsuite/sexp-format-test.c
+3
-3
testsuite/testutils.c
testsuite/testutils.c
+2
-2
tools/input.c
tools/input.c
+1
-1
tools/pkcs1-conv.c
tools/pkcs1-conv.c
+16
-16
No files found.
base16-decode.c
View file @
86fdb2ce
...
...
@@ -93,17 +93,17 @@ base16_decode_single(struct base16_decode_ctx *ctx,
int
base16_decode_update
(
struct
base16_decode_ctx
*
ctx
,
unsigned
*
dst_length
,
size_t
*
dst_length
,
uint8_t
*
dst
,
unsigned
src_length
,
size_t
src_length
,
const
uint8_t
*
src
)
{
unsigned
done
;
unsigned
i
;
size_t
done
;
size_t
i
;
assert
(
*
dst_length
>=
BASE16_DECODE_LENGTH
(
src_length
));
for
(
i
=
0
,
done
=
0
;
i
<
src_length
;
i
++
)
for
(
i
=
done
=
0
;
i
<
src_length
;
i
++
)
switch
(
base16_decode_single
(
ctx
,
dst
+
done
,
src
[
i
]))
{
case
-
1
:
...
...
base16-encode.c
View file @
86fdb2ce
...
...
@@ -47,11 +47,11 @@ base16_encode_single(uint8_t *dst,
/* Always stores BASE16_ENCODE_LENGTH(length) digits in dst. */
void
base16_encode_update
(
uint8_t
*
dst
,
unsigned
length
,
size_t
length
,
const
uint8_t
*
src
)
{
unsigned
i
;
size_t
i
;
for
(
i
=
0
,
dst
;
i
<
length
;
i
++
,
dst
+=
2
)
for
(
i
=
0
;
i
<
length
;
i
++
,
dst
+=
2
)
base16_encode_single
(
dst
,
src
[
i
]);
}
base16-meta.c
View file @
86fdb2ce
...
...
@@ -29,25 +29,29 @@
#include "base16.h"
/* Same as the macros with the same name */
static
unsigned
base16_encode_length
(
unsigned
length
)
static
nettle_armor_length_func
base16_encode_length
;
static
size_t
base16_encode_length
(
size_t
length
)
{
return
BASE16_ENCODE_LENGTH
(
length
);
}
static
unsigned
base16_decode_length
(
unsigned
length
)
static
nettle_armor_length_func
base16_decode_length
;
static
size_t
base16_decode_length
(
size_t
length
)
{
return
BASE16_DECODE_LENGTH
(
length
);
}
static
nettle_armor_init_func
base16_encode_init
;
static
void
base16_encode_init
(
void
*
ctx
)
{
(
void
)
ctx
;
}
base16_encode_init
(
void
*
ctx
UNUSED
)
{
}
static
unsigned
static
nettle_armor_encode_update_func
base16_encode_update_wrapper
;
static
size_t
base16_encode_update_wrapper
(
void
*
ctx
UNUSED
,
uint8_t
*
dst
,
unsigned
length
,
const
uint8_t
*
src
)
size_t
length
,
const
uint8_t
*
src
)
{
base16_encode_update
(
dst
,
length
,
src
);
return
BASE16_ENCODE_LENGTH
(
length
);
...
...
@@ -56,9 +60,12 @@ base16_encode_update_wrapper(void *ctx UNUSED, uint8_t *dst,
#undef base16_encode_update
#define base16_encode_update base16_encode_update_wrapper
static
unsigned
base16_encode_final
(
void
*
ctx
,
uint8_t
*
dst
)
{
(
void
)
ctx
;
(
void
)
dst
;
return
0
;
}
static
nettle_armor_encode_final_func
base16_encode_final
;
static
size_t
base16_encode_final
(
void
*
ctx
UNUSED
,
uint8_t
*
dst
UNUSED
)
{
return
0
;
}
#define BASE16_ENCODE_FINAL_LENGTH 0
...
...
base16.h
View file @
86fdb2ce
...
...
@@ -54,7 +54,7 @@ base16_encode_single(uint8_t *dst,
/* Always stores BASE16_ENCODE_LENGTH(length) digits in dst. */
void
base16_encode_update
(
uint8_t
*
dst
,
unsigned
length
,
size_t
length
,
const
uint8_t
*
src
);
...
...
@@ -90,9 +90,9 @@ base16_decode_single(struct base16_decode_ctx *ctx,
* too small. FIXME: Return some error instead? */
int
base16_decode_update
(
struct
base16_decode_ctx
*
ctx
,
unsigned
*
dst_length
,
size_t
*
dst_length
,
uint8_t
*
dst
,
unsigned
src_length
,
size_t
src_length
,
const
uint8_t
*
src
);
/* Returns 1 on success. */
...
...
base64-decode.c
View file @
86fdb2ce
...
...
@@ -114,13 +114,13 @@ base64_decode_single(struct base64_decode_ctx *ctx,
int
base64_decode_update
(
struct
base64_decode_ctx
*
ctx
,
unsigned
*
dst_length
,
size_t
*
dst_length
,
uint8_t
*
dst
,
unsigned
src_length
,
size_t
src_length
,
const
uint8_t
*
src
)
{
unsigned
done
;
unsigned
i
;
size_t
done
;
size_t
i
;
assert
(
*
dst_length
>=
BASE64_DECODE_LENGTH
(
src_length
));
...
...
base64-encode.c
View file @
86fdb2ce
...
...
@@ -39,7 +39,7 @@ static const uint8_t encode_table[64] =
#define ENCODE(x) (encode_table[0x3F & (x)])
void
base64_encode_raw
(
uint8_t
*
dst
,
unsigned
length
,
const
uint8_t
*
src
)
base64_encode_raw
(
uint8_t
*
dst
,
size_t
length
,
const
uint8_t
*
src
)
{
const
uint8_t
*
in
=
src
+
length
;
uint8_t
*
out
=
dst
+
BASE64_ENCODE_RAW_LENGTH
(
length
);
...
...
@@ -140,7 +140,7 @@ base64_encode_init(struct base64_encode_ctx *ctx)
}
/* Encodes a single byte. */
unsigned
size_t
base64_encode_single
(
struct
base64_encode_ctx
*
ctx
,
uint8_t
*
dst
,
uint8_t
src
)
...
...
@@ -165,16 +165,16 @@ base64_encode_single(struct base64_encode_ctx *ctx,
/* Returns the number of output characters. DST should point to an
* area of size at least BASE64_ENCODE_LENGTH(length). */
unsigned
size_t
base64_encode_update
(
struct
base64_encode_ctx
*
ctx
,
uint8_t
*
dst
,
unsigned
length
,
size_t
length
,
const
uint8_t
*
src
)
{
unsigned
done
=
0
;
unsigned
left
=
length
;
size_t
done
=
0
;
size_t
left
=
length
;
unsigned
left_over
;
unsigned
bulk
;
size_t
bulk
;
while
(
ctx
->
bits
&&
left
)
{
...
...
@@ -208,7 +208,7 @@ base64_encode_update(struct base64_encode_ctx *ctx,
/* DST should point to an area of size at least
* BASE64_ENCODE_FINAL_SIZE */
unsigned
size_t
base64_encode_final
(
struct
base64_encode_ctx
*
ctx
,
uint8_t
*
dst
)
{
...
...
base64-meta.c
View file @
86fdb2ce
...
...
@@ -29,14 +29,16 @@
#include "base64.h"
/* Same as the macros with the same name */
static
unsigned
base64_encode_length
(
unsigned
length
)
static
nettle_armor_length_func
base64_encode_length
;
static
size_t
base64_encode_length
(
size_t
length
)
{
return
BASE64_ENCODE_LENGTH
(
length
);
}
static
unsigned
base64_decode_length
(
unsigned
length
)
static
nettle_armor_length_func
base64_decode_length
;
static
size_t
base64_decode_length
(
size_t
length
)
{
return
BASE64_DECODE_LENGTH
(
length
);
}
...
...
base64.h
View file @
86fdb2ce
...
...
@@ -71,22 +71,22 @@ void
base64_encode_init
(
struct
base64_encode_ctx
*
ctx
);
/* Encodes a single byte. Returns amount of output (always 1 or 2). */
unsigned
size_t
base64_encode_single
(
struct
base64_encode_ctx
*
ctx
,
uint8_t
*
dst
,
uint8_t
src
);
/* Returns the number of output characters. DST should point to an
* area of size at least BASE64_ENCODE_LENGTH(length). */
unsigned
size_t
base64_encode_update
(
struct
base64_encode_ctx
*
ctx
,
uint8_t
*
dst
,
unsigned
length
,
size_t
length
,
const
uint8_t
*
src
);
/* DST should point to an area of size at least
* BASE64_ENCODE_FINAL_LENGTH */
unsigned
size_t
base64_encode_final
(
struct
base64_encode_ctx
*
ctx
,
uint8_t
*
dst
);
...
...
@@ -96,7 +96,7 @@ base64_encode_final(struct base64_encode_ctx *ctx,
* Generates exactly BASE64_ENCODE_RAW_LENGTH(length) bytes of output.
* Supports overlapped operation, if src <= dst. */
void
base64_encode_raw
(
uint8_t
*
dst
,
unsigned
length
,
const
uint8_t
*
src
);
base64_encode_raw
(
uint8_t
*
dst
,
size_t
length
,
const
uint8_t
*
src
);
void
base64_encode_group
(
uint8_t
*
dst
,
uint32_t
group
);
...
...
@@ -137,9 +137,9 @@ base64_decode_single(struct base64_decode_ctx *ctx,
* too small. FIXME: Return some error instead? */
int
base64_decode_update
(
struct
base64_decode_ctx
*
ctx
,
unsigned
*
dst_length
,
size_t
*
dst_length
,
uint8_t
*
dst
,
unsigned
src_length
,
size_t
src_length
,
const
uint8_t
*
src
);
/* Returns 1 on success. */
...
...
buffer.c
View file @
86fdb2ce
...
...
@@ -35,13 +35,13 @@
int
nettle_buffer_grow
(
struct
nettle_buffer
*
buffer
,
unsigned
length
)
size_t
length
)
{
assert
(
buffer
->
size
<=
buffer
->
alloc
);
if
(
buffer
->
size
+
length
>
buffer
->
alloc
)
{
unsigned
alloc
;
size_t
alloc
;
uint8_t
*
p
;
if
(
!
buffer
->
realloc
)
...
...
@@ -72,7 +72,7 @@ nettle_buffer_init_realloc(struct nettle_buffer *buffer,
void
nettle_buffer_init_size
(
struct
nettle_buffer
*
buffer
,
unsigned
length
,
uint8_t
*
space
)
size_t
length
,
uint8_t
*
space
)
{
buffer
->
contents
=
space
;
buffer
->
alloc
=
length
;
...
...
@@ -100,7 +100,7 @@ nettle_buffer_reset(struct nettle_buffer *buffer)
uint8_t
*
nettle_buffer_space
(
struct
nettle_buffer
*
buffer
,
unsigned
length
)
size_t
length
)
{
uint8_t
*
p
;
...
...
@@ -114,7 +114,7 @@ nettle_buffer_space(struct nettle_buffer *buffer,
int
nettle_buffer_write
(
struct
nettle_buffer
*
buffer
,
unsigned
length
,
const
uint8_t
*
data
)
size_t
length
,
const
uint8_t
*
data
)
{
uint8_t
*
p
=
nettle_buffer_space
(
buffer
,
length
);
if
(
p
)
...
...
buffer.h
View file @
86fdb2ce
...
...
@@ -36,13 +36,13 @@ struct nettle_buffer
{
uint8_t
*
contents
;
/* Allocated size */
unsigned
alloc
;
size_t
alloc
;
void
*
realloc_ctx
;
nettle_realloc_func
*
realloc
;
/* Current size */
unsigned
size
;
size_t
size
;
};
/* Initializes a buffer that uses plain realloc */
...
...
@@ -57,7 +57,7 @@ nettle_buffer_init_realloc(struct nettle_buffer *buffer,
/* Initializes a buffer of fix size */
void
nettle_buffer_init_size
(
struct
nettle_buffer
*
buffer
,
unsigned
length
,
uint8_t
*
space
);
size_t
length
,
uint8_t
*
space
);
void
nettle_buffer_clear
(
struct
nettle_buffer
*
buffer
);
...
...
@@ -68,7 +68,7 @@ nettle_buffer_reset(struct nettle_buffer *buffer);
int
nettle_buffer_grow
(
struct
nettle_buffer
*
buffer
,
unsigned
length
);
size_t
length
);
#define NETTLE_BUFFER_PUTC(buffer, c) \
( (((buffer)->size < (buffer)->alloc) || nettle_buffer_grow((buffer), 1)) \
...
...
@@ -76,7 +76,7 @@ nettle_buffer_grow(struct nettle_buffer *buffer,
int
nettle_buffer_write
(
struct
nettle_buffer
*
buffer
,
unsigned
length
,
const
uint8_t
*
data
);
size_t
length
,
const
uint8_t
*
data
);
/* Like nettle_buffer_write, but instead of copying data to the
* buffer, it returns a pointer to the area where the caller can copy
...
...
@@ -84,7 +84,7 @@ nettle_buffer_write(struct nettle_buffer *buffer,
* reallocate the buffer. */
uint8_t
*
nettle_buffer_space
(
struct
nettle_buffer
*
buffer
,
unsigned
length
);
size_t
length
);
/* Copy the contents of SRC to the end of DST. */
int
...
...
examples/base16dec.c
View file @
86fdb2ce
...
...
@@ -65,7 +65,7 @@ main(int argc UNUSED, char **argv UNUSED)
for
(;;)
{
int
nbytes
;
/* Number of bytes read frmo disk at each iteration */
unsigned
decoded_bytes
;
/* Bytes actually generated at each iteration */
size_t
decoded_bytes
;
/* Bytes actually generated at each iteration */
nbytes
=
fread
(
buffer
,
1
,
CHUNK_SIZE
,
stdin
);
...
...
examples/base64dec.c
View file @
86fdb2ce
...
...
@@ -65,7 +65,7 @@ main(int argc UNUSED, char **argv UNUSED)
for
(;;)
{
int
nbytes
;
/* Number of bytes read frmo disk at each iteration */
unsigned
decoded_bytes
;
/* Bytes actually generated at each iteration */
size_t
decoded_bytes
;
/* Bytes actually generated at each iteration */
nbytes
=
fread
(
buffer
,
1
,
CHUNK_SIZE
,
stdin
);
...
...
nettle-types.h
View file @
86fdb2ce
...
...
@@ -67,20 +67,20 @@ typedef void nettle_hash_digest_func(void *ctx,
/* ASCII armor codecs. NOTE: Experimental and subject to change. */
typedef
unsigned
nettle_armor_length_func
(
unsigned
length
);
typedef
size_t
nettle_armor_length_func
(
size_t
length
);
typedef
void
nettle_armor_init_func
(
void
*
ctx
);
typedef
unsigned
nettle_armor_encode_update_func
(
void
*
ctx
,
typedef
size_t
nettle_armor_encode_update_func
(
void
*
ctx
,
uint8_t
*
dst
,
unsigned
src_length
,
size_t
src_length
,
const
uint8_t
*
src
);
typedef
unsigned
nettle_armor_encode_final_func
(
void
*
ctx
,
uint8_t
*
dst
);
typedef
size_t
nettle_armor_encode_final_func
(
void
*
ctx
,
uint8_t
*
dst
);
typedef
int
nettle_armor_decode_update_func
(
void
*
ctx
,
unsigned
*
dst_length
,
size_t
*
dst_length
,
uint8_t
*
dst
,
unsigned
src_length
,
size_t
src_length
,
const
uint8_t
*
src
);
typedef
int
nettle_armor_decode_final_func
(
void
*
ctx
);
...
...
sexp-format.c
View file @
86fdb2ce
...
...
@@ -40,14 +40,14 @@
static
unsigned
format_prefix
(
struct
nettle_buffer
*
buffer
,
unsigned
length
)
size_t
length
)
{
unsigned
digit
=
1
;
size_t
digit
=
1
;
unsigned
prefix_length
=
1
;
for
(;;)
{
unsigned
next
=
digit
*
10
;
size_t
next
=
digit
*
10
;
if
(
next
>
length
)
break
;
...
...
@@ -68,9 +68,9 @@ format_prefix(struct nettle_buffer *buffer,
return
prefix_length
+
1
;
}
static
unsigned
static
size_t
format_string
(
struct
nettle_buffer
*
buffer
,
unsigned
length
,
const
uint8_t
*
s
)
size_t
length
,
const
uint8_t
*
s
)
{
unsigned
prefix_length
=
format_prefix
(
buffer
,
length
);
if
(
!
prefix_length
)
...
...
@@ -82,11 +82,11 @@ format_string(struct nettle_buffer *buffer,
return
prefix_length
+
length
;
}
unsigned
size_t
sexp_vformat
(
struct
nettle_buffer
*
buffer
,
const
char
*
format
,
va_list
args
)
{
unsigned
nesting
=
0
;
unsigned
done
=
0
;
size_t
done
=
0
;
for
(;;)
switch
(
*
format
++
)
...
...
@@ -94,8 +94,8 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
default:
{
const
char
*
start
=
format
-
1
;
unsigned
length
=
1
+
strcspn
(
format
,
"()%
\t
"
);
unsigned
output_length
=
format_string
(
buffer
,
length
,
start
);
size_t
length
=
1
+
strcspn
(
format
,
"()%
\t
"
);
size_t
output_length
=
format_string
(
buffer
,
length
,
start
);
if
(
!
output_length
)
return
0
;
...
...
@@ -154,8 +154,8 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
case
's'
:
{
const
char
*
s
;
unsigned
length
;
unsigned
output_length
;
size_t
length
;
size_t
output_length
;
if
(
nul_flag
)
{
...
...
@@ -164,7 +164,7 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
}
else
{
length
=
va_arg
(
args
,
unsigned
);
length
=
va_arg
(
args
,
size_t
);
s
=
va_arg
(
args
,
const
char
*
);
}
...
...
@@ -178,8 +178,8 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
case
't'
:
{
const
char
*
s
;
unsigned
length
;
unsigned
output_length
;
size_t
length
;
size_t
output_length
;
if
(
nul_flag
)
{
...
...
@@ -191,7 +191,7 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
}
else
{
length
=
va_arg
(
args
,
unsigned
);
length
=
va_arg
(
args
,
size_t
);
s
=
va_arg
(
args
,
const
char
*
);
if
(
!
s
)
break
;
...
...
@@ -218,7 +218,7 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
case
'l'
:
{
const
char
*
s
;
unsigned
length
;
size_t
length
;
if
(
nul_flag
)
{
...
...
@@ -227,7 +227,7 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
}
else
{
length
=
va_arg
(
args
,
unsigned
);
length
=
va_arg
(
args
,
size_t
);
s
=
va_arg
(
args
,
const
char
*
);
}
...
...
@@ -291,7 +291,7 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
case
'b'
:
{
const
MP_INT
*
n
=
va_arg
(
args
,
const
MP_INT
*
);
unsigned
length
;
size_t
length
;
unsigned
prefix_length
;
length
=
nettle_mpz_sizeinbase_256_s
(
n
);
...
...
@@ -319,11 +319,11 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
}
}
unsigned
size_t
sexp_format
(
struct
nettle_buffer
*
buffer
,
const
char
*
format
,
...)
{
va_list
args
;
unsigned
done
;
size_t
done
;
va_start
(
args
,
format
);
done
=
sexp_vformat
(
buffer
,
format
,
args
);
...
...
sexp-transport-format.c
View file @
86fdb2ce
...
...
@@ -32,13 +32,13 @@
#include "base64.h"
#include "buffer.h"
unsigned
size_t
sexp_transport_vformat
(
struct
nettle_buffer
*
buffer
,
const
char
*
format
,
va_list
args
)
{
unsigned
start
=
0
;
unsigned
length
;
unsigned
base64_length
;
size_t
start
=
0
;
size_t
length
;
size_t
base64_length
;
if
(
buffer
)
{
...
...
@@ -70,11 +70,11 @@ sexp_transport_vformat(struct nettle_buffer *buffer,
return
base64_length
+
2
;
}
unsigned
size_t
sexp_transport_format
(
struct
nettle_buffer
*
buffer
,
const
char
*
format
,
...)
{
unsigned
done
;
size_t
done
;
va_list
args
;
va_start
(
args
,
format
);
...
...
sexp-transport.c
View file @
86fdb2ce
...
...
@@ -37,13 +37,13 @@
/* NOTE: Decodes the input string in place */
int
sexp_transport_iterator_first
(
struct
sexp_iterator
*
iterator
,
unsigned
length
,
uint8_t
*
input
)
size_t
length
,
uint8_t
*
input
)
{
/* We first base64 decode any transport encoded sexp at the start of
* the input. */
unsigned
in
=
0
;
unsigned
out
=
0
;
size_t
in
=
0
;
size_t
out
=
0
;
while
(
in
<
length
)
switch
(
input
[
in
])
...
...
@@ -64,8 +64,8 @@ sexp_transport_iterator_first(struct sexp_iterator *iterator,
{
/* Found transport encoding */
struct
base64_decode_ctx
ctx
;
unsigned
coded_length
;
unsigned
end
;
size_t
coded_length
;
size_t
end
;
for
(
end
=
++
in
;
end
<
length
&&
input
[
end
]
!=
'}'
;
end
++
)
;
...
...
sexp.c
View file @
86fdb2ce
...
...
@@ -57,7 +57,7 @@ sexp_iterator_init(struct sexp_iterator *iterator,
static
int
sexp_iterator_simple
(
struct
sexp_iterator
*
iterator
,
unsigned
*
size
,
size_t
*
size
,
const
uint8_t
**
string
)
{
unsigned
length
=
0
;
...
...
@@ -156,7 +156,7 @@ sexp_iterator_parse(struct sexp_iterator *iterator)
int
sexp_iterator_first
(
struct
sexp_iterator
*
iterator
,
unsigned
length
,
const
uint8_t
*
input
)
size_t
length
,
const
uint8_t
*
input
)
{
sexp_iterator_init
(
iterator
,
length
,
input
);
return
sexp_iterator_parse
(
iterator
);
...
...
@@ -232,9 +232,9 @@ sexp_iterator_exit_lists(struct sexp_iterator *iterator,
const
uint8_t
*
sexp_iterator_subexpr
(
struct
sexp_iterator
*
iterator
,
unsigned
*
length
)
size_t
*
length
)
{
unsigned
start
=
iterator
->
start
;
size_t
start
=
iterator
->
start
;
if
(
!
sexp_iterator_next
(
iterator
))
return
0
;
...
...
@@ -251,7 +251,7 @@ sexp_iterator_get_uint32(struct sexp_iterator *iterator,
&&
iterator
->
atom_length
&&
iterator
->
atom
[
0
]
<
0x80
)
{
unsigned
length
=
iterator
->
atom_length
;
size_t
length
=
iterator
->
atom_length
;
const
uint8_t
*
p
=
iterator
->
atom
;
/* Skip leading zeros. */
...
...
sexp.h
View file @
86fdb2ce
...
...
@@ -55,22 +55,22 @@ enum sexp_type
struct
sexp_iterator
{
unsigned
length
;
size_t
length
;
const
uint8_t
*
buffer
;
/* Points at the start of the current sub expression. */
unsigned
start
;
size_t
start
;
/* If type is SEXP_LIST, pos points at the start of the current
* element. Otherwise, it points at the end. */
unsigned
pos
;
size_t
pos
;
unsigned
level
;
enum
sexp_type
type
;
unsigned
display_length
;
size_t
display_length
;
const
uint8_t
*
display
;