Commit 2a65d90b authored by Niels Möller's avatar Niels Möller

Use const char * for sexp expression types.

parent ef97526d
2016-08-16 Niels Möller <nisse@lysator.liu.se> 2016-08-16 Niels Möller <nisse@lysator.liu.se>
* sexp.c (sexp_iterator_check_type, sexp_iterator_check_types)
(sexp_iterator_assoc): Use const char * for caller's expression
types. Updated all callers.
* rsa2openpgp.c (rsa_keypair_to_openpgp): Added cast to const * rsa2openpgp.c (rsa_keypair_to_openpgp): Added cast to const
uint8_t *. uint8_t *.
......
...@@ -295,7 +295,7 @@ sexp_iterator_get_uint32(struct sexp_iterator *iterator, ...@@ -295,7 +295,7 @@ sexp_iterator_get_uint32(struct sexp_iterator *iterator,
int int
sexp_iterator_check_type(struct sexp_iterator *iterator, sexp_iterator_check_type(struct sexp_iterator *iterator,
const uint8_t *type) const char *type)
{ {
return (sexp_iterator_enter_list(iterator) return (sexp_iterator_enter_list(iterator)
&& iterator->type == SEXP_ATOM && iterator->type == SEXP_ATOM
...@@ -305,10 +305,10 @@ sexp_iterator_check_type(struct sexp_iterator *iterator, ...@@ -305,10 +305,10 @@ sexp_iterator_check_type(struct sexp_iterator *iterator,
&& sexp_iterator_next(iterator)); && sexp_iterator_next(iterator));
} }
const uint8_t * const char *
sexp_iterator_check_types(struct sexp_iterator *iterator, sexp_iterator_check_types(struct sexp_iterator *iterator,
unsigned ntypes, unsigned ntypes,
const uint8_t * const *types) const char * const *types)
{ {
if (sexp_iterator_enter_list(iterator) if (sexp_iterator_enter_list(iterator)
&& iterator->type == SEXP_ATOM && iterator->type == SEXP_ATOM
...@@ -327,7 +327,7 @@ sexp_iterator_check_types(struct sexp_iterator *iterator, ...@@ -327,7 +327,7 @@ sexp_iterator_check_types(struct sexp_iterator *iterator,
int int
sexp_iterator_assoc(struct sexp_iterator *iterator, sexp_iterator_assoc(struct sexp_iterator *iterator,
unsigned nkeys, unsigned nkeys,
const uint8_t * const *keys, const char * const *keys,
struct sexp_iterator *values) struct sexp_iterator *values)
{ {
TMP_DECL(found, int, NETTLE_MAX_SEXP_ASSOC); TMP_DECL(found, int, NETTLE_MAX_SEXP_ASSOC);
......
...@@ -130,12 +130,12 @@ sexp_iterator_get_uint32(struct sexp_iterator *iterator, ...@@ -130,12 +130,12 @@ sexp_iterator_get_uint32(struct sexp_iterator *iterator,
*/ */
int int
sexp_iterator_check_type(struct sexp_iterator *iterator, sexp_iterator_check_type(struct sexp_iterator *iterator,
const uint8_t *type); const char *type);
const uint8_t * const char *
sexp_iterator_check_types(struct sexp_iterator *iterator, sexp_iterator_check_types(struct sexp_iterator *iterator,
unsigned ntypes, unsigned ntypes,
const uint8_t * const *types); const char * const *types);
/* Current element must be a list. Looks up element of type /* Current element must be a list. Looks up element of type
* *
...@@ -149,7 +149,7 @@ sexp_iterator_check_types(struct sexp_iterator *iterator, ...@@ -149,7 +149,7 @@ sexp_iterator_check_types(struct sexp_iterator *iterator,
int int
sexp_iterator_assoc(struct sexp_iterator *iterator, sexp_iterator_assoc(struct sexp_iterator *iterator,
unsigned nkeys, unsigned nkeys,
const uint8_t * const *keys, const char * const *keys,
struct sexp_iterator *values); struct sexp_iterator *values);
......
...@@ -61,7 +61,7 @@ dsa_keypair_from_sexp_alist(struct dsa_params *params, ...@@ -61,7 +61,7 @@ dsa_keypair_from_sexp_alist(struct dsa_params *params,
unsigned q_bits, unsigned q_bits,
struct sexp_iterator *i) struct sexp_iterator *i)
{ {
static const uint8_t * const names[5] static const char * const names[5]
= { "p", "q", "g", "y", "x" }; = { "p", "q", "g", "y", "x" };
struct sexp_iterator values[5]; struct sexp_iterator values[5];
unsigned nvalues = priv ? 5 : 4; unsigned nvalues = priv ? 5 : 4;
...@@ -131,7 +131,7 @@ dsa_signature_from_sexp(struct dsa_signature *rs, ...@@ -131,7 +131,7 @@ dsa_signature_from_sexp(struct dsa_signature *rs,
struct sexp_iterator *i, struct sexp_iterator *i,
unsigned q_bits) unsigned q_bits)
{ {
static const uint8_t * const names[2] = { "r", "s" }; static const char * const names[2] = { "r", "s" };
struct sexp_iterator values[2]; struct sexp_iterator values[2];
if (!sexp_iterator_assoc(i, 2, names, values)) if (!sexp_iterator_assoc(i, 2, names, values))
......
...@@ -59,7 +59,7 @@ rsa_keypair_from_sexp_alist(struct rsa_public_key *pub, ...@@ -59,7 +59,7 @@ rsa_keypair_from_sexp_alist(struct rsa_public_key *pub,
unsigned limit, unsigned limit,
struct sexp_iterator *i) struct sexp_iterator *i)
{ {
static const uint8_t * const names[8] static const char * const names[8]
= { "n", "e", "d", "p", "q", "a", "b", "c" }; = { "n", "e", "d", "p", "q", "a", "b", "c" };
struct sexp_iterator values[8]; struct sexp_iterator values[8];
unsigned nvalues = priv ? 8 : 2; unsigned nvalues = priv ? 8 : 2;
...@@ -99,7 +99,7 @@ rsa_keypair_from_sexp(struct rsa_public_key *pub, ...@@ -99,7 +99,7 @@ rsa_keypair_from_sexp(struct rsa_public_key *pub,
size_t length, const uint8_t *expr) size_t length, const uint8_t *expr)
{ {
struct sexp_iterator i; struct sexp_iterator i;
static const uint8_t * const names[3] static const char * const names[3]
= { "rsa", "rsa-pkcs1", "rsa-pkcs1-sha1" }; = { "rsa", "rsa-pkcs1", "rsa-pkcs1-sha1" };
if (!sexp_iterator_first(&i, length, expr)) if (!sexp_iterator_first(&i, length, expr))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment