proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-12 01:20:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7511 from donaldsharp/vtysh_warn

Browse Source 
Vtysh excessive/too little doc string re-instatement
This commit is contained in:
Patrick Ruddy 2020-11-17 16:35:48 +00:00 committed by GitHub
commit d50f52b9da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/command_parse.y
View File

@ -492,11 +492,11 @@ terminate_graph (CMD_YYLTYPE *locp, struct parser_ctx *ctx,
graph_new_node (ctx->graph, (void *)element, NULL); graph_new_node (ctx->graph, (void *)element, NULL);
if (ctx->docstr && strlen (ctx->docstr) > 1) { if (ctx->docstr && strlen (ctx->docstr) > 1) {
zlog_debug ("Excessive docstring while parsing '%s'", ctx->el->string); zlog_err ("Excessive docstring while parsing '%s'", ctx->el->string);
zlog_debug ("----------"); zlog_err ("----------");
while (ctx->docstr && ctx->docstr[1] != '\0') while (ctx->docstr && ctx->docstr[1] != '\0')
zlog_debug ("%s", strsep(&ctx->docstr, "\n")); zlog_err ("%s", strsep(&ctx->docstr, "\n"));
zlog_debug ("----------\n"); zlog_err ("----------\n");
} }
graph_add_edge (finalnode, end_token_node); graph_add_edge (finalnode, end_token_node);
@ -509,7 +509,7 @@ doc_next (struct parser_ctx *ctx)
const char *piece = ctx->docstr ? strsep (&ctx->docstr, "\n") : ""; const char *piece = ctx->docstr ? strsep (&ctx->docstr, "\n") : "";
if (*piece == 0x03) if (*piece == 0x03)
{ {
zlog_debug ("Ran out of docstring while parsing '%s'", ctx->el->string); zlog_err ("Ran out of docstring while parsing '%s'", ctx->el->string);
piece = ""; piece = "";
} }

4
ospfd/ospf_vty.c
View File

@ -10155,8 +10155,8 @@ DEFUN (no_ospf_external_route_aggregation_no_adrvertise,
"no summary-address A.B.C.D/M no-advertise", "no summary-address A.B.C.D/M no-advertise",
NO_STR NO_STR
"External summary address\n" "External summary address\n"
"Summary address prefix (a.b.c.d/m) \n" "Summary address prefix (a.b.c.d/m)\n"
"Adverise summary route to the AS \n.") "Advertise summary route to the AS \n")
{ {
VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf); VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
struct prefix_ipv4 p; struct prefix_ipv4 p;