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