Commit b8f5c597 authored by Niels Möller's avatar Niels Möller
Browse files

* src/combinators.c (command_I): Redefined using DEFINE_COMMAND.

Updated users as the type was changed in the process.

Rev: src/lsh-writekey.c:1.14
Rev: src/sexp-conv.c:1.8
Rev: src/spki_commands.c:1.22
parent f2c3e03e
......@@ -336,7 +336,7 @@ DEFINE_COMMAND_SIMPLE(lsh_writekey_options2transform, a)
{
CAST(lsh_writekey_options, options, a);
if (!options->crypto)
return &command_I.super.super;
return &command_I.super;
else
{
CAST_SUBTYPE(mac_algorithm, hmac,
......
......@@ -269,8 +269,8 @@ static struct sexp_conv_options *make_options(void)
self->output = SEXP_ADVANCED;
self->once = 0;
self->mode = MODE_VANILLA;
self->select = &command_I.super;
self->transform = &command_I.super;
self->select = &command_I;
self->transform = &command_I;
self->algorithms = make_alist(2,
ATOM_MD5, &md5_algorithm,
ATOM_SHA1, &sha1_algorithm,
......@@ -310,7 +310,7 @@ main_argp_parser(int key, char *arg, struct argp_state *state)
default:
fatal("Internal error!");
case MODE_VANILLA:
self->transform = &command_I.super;
self->transform = &command_I;
self->print = &make_sexp_print_command(self->output)->super;
break;
case MODE_SPKI_HASH:
......@@ -325,7 +325,7 @@ main_argp_parser(int key, char *arg, struct argp_state *state)
{
CAST_SUBTYPE(hash_algorithm, a,
ALIST_GET(self->algorithms, self->hash));
self->transform = &command_I.super;
self->transform = &command_I;
self->print = make_sexp_print_raw_hash(a);
break;
}
......
......@@ -527,7 +527,7 @@ make_spki_read_userkeys(struct alist *algorithms,
decrypt = make_pkcs5_decrypt(mac, crypto, tty);
}
else
decrypt = &command_I.super;
decrypt = &command_I;
{
CAST_SUBTYPE(command, res,
......
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