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

Adapted to change in collect_info_3.

Rev: src/combinators.c:1.11
Rev: src/handshake.c:1.4
parent 5d914802
......@@ -227,7 +227,7 @@ struct command *make_command_Sp_3(struct command *c,
return &res->super.super;
}
struct lsh_object *collect_Sp_3(struct collect_info_3 *info,
struct lsh_object *collect_Sp_3(struct collect_info_3 *info UNUSED,
struct lsh_object *c,
struct lsh_object *f,
struct lsh_object *g)
......@@ -235,7 +235,6 @@ struct lsh_object *collect_Sp_3(struct collect_info_3 *info,
CAST_SUBTYPE(command, cc, c);
CAST_SUBTYPE(command, cf, f);
CAST_SUBTYPE(command, cg, g);
assert(!info->next);
return &make_command_Sp_3(cc, cf, cg)->super;
}
......@@ -366,7 +365,7 @@ make_command_Bp_3(struct command *c,
return &res->super.super;
}
struct lsh_object *collect_Bp_3(struct collect_info_3 *info,
struct lsh_object *collect_Bp_3(struct collect_info_3 *info UNUSED,
struct lsh_object *c,
struct lsh_object *f,
struct lsh_object *g)
......@@ -374,7 +373,6 @@ struct lsh_object *collect_Bp_3(struct collect_info_3 *info,
CAST_SUBTYPE(command, cc, c);
CAST_SUBTYPE(command, cf, f);
CAST_SUBTYPE(command, cg, g);
assert(!info->next);
return &make_command_Bp_3(cc, cf, cg)->super;
}
......@@ -538,14 +536,13 @@ make_command_Cp_3(struct command *c,
}
struct lsh_object *
collect_Cp_3(struct collect_info_3 *info,
collect_Cp_3(struct collect_info_3 *info UNUSED,
struct lsh_object *c,
struct lsh_object *f,
struct lsh_object *y)
{
CAST_SUBTYPE(command, cc, c);
CAST_SUBTYPE(command, cf, f);
assert(!info->next);
return &make_command_Cp_3(cc, cf, y)->super;
}
......
......@@ -393,7 +393,7 @@ do_handshake(struct command *s,
}
static struct lsh_object *
collect_handshake_3(struct collect_info_3 *info,
collect_handshake_3(struct collect_info_3 *info UNUSED,
struct lsh_object *h,
struct lsh_object *i,
struct lsh_object *extra)
......@@ -402,8 +402,9 @@ collect_handshake_3(struct collect_info_3 *info,
CAST_SUBTYPE(make_kexinit, init, i);
NEW(handshake_command_2, self);
#if 0
assert(!info->next);
#endif
self->super.call = do_handshake;
self->info = hinfo;
self->init = init;
......
Supports Markdown
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