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
Labels
Merge Requests
5
Merge Requests
5
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Nettle
nettle
Commits
abe959a3
Commit
abe959a3
authored
Aug 29, 2016
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pointer sign warnings in sexp_vformat.
parent
59ec2fc8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
13 deletions
+25
-13
ChangeLog
ChangeLog
+5
-0
sexp-format.c
sexp-format.c
+20
-13
No files found.
ChangeLog
View file @
abe959a3
2016-08-29 Niels Möller <nisse@lysator.liu.se>
* sexp-format.c (strlen_u8): New helper function.
(sexp_vformat): Use uint8_t * for strings instead of char *.
2016-08-16 Niels Möller <nisse@lysator.liu.se>
* examples/io.c (hash_file): Use uint8_t for buffer.
...
...
sexp-format.c
View file @
abe959a3
...
...
@@ -90,6 +90,12 @@ format_string(struct nettle_buffer *buffer,
return
prefix_length
+
length
;
}
static
inline
size_t
strlen_u8
(
const
uint8_t
*
s
)
{
return
strlen
((
const
char
*
)
s
);
}
size_t
sexp_vformat
(
struct
nettle_buffer
*
buffer
,
const
char
*
format
,
va_list
args
)
{
...
...
@@ -103,7 +109,8 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
{
const
char
*
start
=
format
-
1
;
size_t
length
=
1
+
strcspn
(
format
,
"()%
\t
"
);
size_t
output_length
=
format_string
(
buffer
,
length
,
start
);
size_t
output_length
=
format_string
(
buffer
,
length
,
(
const
uint8_t
*
)
start
);
if
(
!
output_length
)
return
0
;
...
...
@@ -161,19 +168,19 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
case
's'
:
{
const
char
*
s
;
const
uint8_t
*
s
;
size_t
length
;
size_t
output_length
;
if
(
nul_flag
)
{
s
=
va_arg
(
args
,
const
char
*
);
length
=
strlen
(
s
);
s
=
va_arg
(
args
,
const
uint8_t
*
);
length
=
strlen
_u8
(
s
);
}
else
{
length
=
va_arg
(
args
,
size_t
);
s
=
va_arg
(
args
,
const
char
*
);
s
=
va_arg
(
args
,
const
uint8_t
*
);
}
output_length
=
format_string
(
buffer
,
length
,
s
);
...
...
@@ -185,22 +192,22 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
}
case
't'
:
{
const
char
*
s
;
const
uint8_t
*
s
;
size_t
length
;
size_t
output_length
;
if
(
nul_flag
)
{
s
=
va_arg
(
args
,
const
char
*
);
s
=
va_arg
(
args
,
const
uint8_t
*
);
if
(
!
s
)
break
;
length
=
strlen
(
s
);
length
=
strlen
_u8
(
s
);
}
else
{
length
=
va_arg
(
args
,
size_t
);
s
=
va_arg
(
args
,
const
char
*
);
s
=
va_arg
(
args
,
const
uint8_t
*
);
if
(
!
s
)
break
;
}
...
...
@@ -225,18 +232,18 @@ sexp_vformat(struct nettle_buffer *buffer, const char *format, va_list args)
case
'l'
:
{
const
char
*
s
;
const
uint8_t
*
s
;
size_t
length
;
if
(
nul_flag
)
{
s
=
va_arg
(
args
,
const
char
*
);
length
=
strlen
(
s
);
s
=
va_arg
(
args
,
const
uint8_t
*
);
length
=
strlen
_u8
(
s
);
}
else
{
length
=
va_arg
(
args
,
size_t
);
s
=
va_arg
(
args
,
const
char
*
);
s
=
va_arg
(
args
,
const
uint8_t
*
);
}
if
(
buffer
&&
!
nettle_buffer_write
(
buffer
,
length
,
s
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment