diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-07-05 19:41:51 +0000 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-07-05 19:41:51 +0000 |
| commit | b83c95ce27d1bb7af54767e3265a04b3ad7d058b (patch) | |
| tree | 4844d16fa6af7742c311c34bf24110f4ab25c7c1 /lib/thread.c | |
| parent | b738b1ac66dd4c168246b878e6adee85ee61c9a1 (diff) | |
| parent | c6200b54679f7e65d4a1036cece3d6cb08ccb9c5 (diff) | |
Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-ipv4-plus-label-misc3
Diffstat (limited to 'lib/thread.c')
| -rw-r--r-- | lib/thread.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/thread.c b/lib/thread.c index 801168a799..4e72d4c96f 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -271,7 +271,7 @@ DEFUN (show_thread_cpu, filter = parse_filter (argv[idx]->arg); if (!filter) { vty_outln(vty, "Invalid filter \"%s\" specified; must contain at least" - "one of 'RWTEXB'%s", argv[idx]->arg); + "one of 'RWTEXB'", argv[idx]->arg); return CMD_WARNING; } } @@ -295,7 +295,7 @@ DEFUN (clear_thread_cpu, filter = parse_filter (argv[idx]->arg); if (!filter) { vty_outln(vty, "Invalid filter \"%s\" specified; must contain at least" - "one of 'RWTEXB'%s", argv[idx]->arg); + "one of 'RWTEXB'", argv[idx]->arg); return CMD_WARNING; } } @@ -388,7 +388,7 @@ thread_master_create (const char *name) rv->cpu_record = hash_create ((unsigned int (*) (void *))cpu_record_hash_key, (int (*) (const void *, const void *)) - cpu_record_hash_cmp); + cpu_record_hash_cmp, NULL); /* Initialize the timer queues */ |