static clib_error_t *
main_stub_init (vlib_main_t * vm)
{
- clib_error_t *error;
-
- if ((error =
- unix_physmem_init (vm, /* fail_if_physical_memory_not_present */ 0)))
- return error;
-
- if ((error = vlib_call_init_function (vm, unix_cli_init)))
- return error;
+ clib_error_t *error = 0;
return error;
}
-VLIB_INIT_FUNCTION (main_stub_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (main_stub_init) =
+{
+ .runs_after = VLIB_INITS("unix_physmem_init", "unix_cli_init"),
+};
+/* *INDENT-ON* */
#if 0
/* Node test code. */
format_my_node_frame (u8 * s, va_list * va)
{
vlib_frame_t *f = va_arg (*va, vlib_frame_t *);
- my_frame_t *g = vlib_frame_args (f);
+ my_frame_t *g = vlib_frame_scalar_args (f);
int i;
s = format (s, "scalar %d, vector { ", g->scalar);
{
vlib_frame_t *next = vlib_get_next_frame (vm, rt, /* next index */ 0);
n_left = VLIB_FRAME_SIZE - next->n_vectors;
- y = vlib_frame_args (next);
+ y = vlib_frame_scalar_args (next);
y->scalar = serial++;
}
else
vlib_cli_output (vm, "%U %v: completion #%d type %d data 0x%wx",
format_time_interval, "h:m:s:u",
vlib_time_now (vm), node->name, i, type, data[0]);
- _vec_len (data) = 0;
+ vec_set_len (data, 0);
}
vec_free (data);