X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fcmdline%2Fcommands.c;h=aec151d08987bac7b49ac5b631920d31d7ee19b9;hb=23f7ec1d9b7ccfcfb9b9f67d33cf6cbf7f5034d3;hp=dce8bc93c77a0b9c7127e92ba84b1fd160465dbb;hpb=1c1d4d7a923d4804f1926fc5264f9ecdd8977b04;p=dpdk.git diff --git a/examples/cmdline/commands.c b/examples/cmdline/commands.c index dce8bc93c7..aec151d089 100644 --- a/examples/cmdline/commands.c +++ b/examples/cmdline/commands.c @@ -1,74 +1,14 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation. * Copyright (c) 2009, Olivier MATZ * All rights reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the University of California, Berkeley nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include #include #include #include -#include #include -#include -#include -#ifndef __linux__ -#include -#endif #include #include @@ -117,6 +57,7 @@ struct object_list global_obj_list; /**********************************************************/ +/* Show or delete tokens. 8< */ struct cmd_obj_del_show_result { cmdline_fixed_string_t action; struct object *obj; @@ -124,16 +65,16 @@ struct cmd_obj_del_show_result { static void cmd_obj_del_show_parsed(void *parsed_result, struct cmdline *cl, - __attribute__((unused)) void *data) + __rte_unused void *data) { struct cmd_obj_del_show_result *res = parsed_result; char ip_str[INET6_ADDRSTRLEN]; if (res->obj->ip.family == AF_INET) - rte_snprintf(ip_str, sizeof(ip_str), NIPQUAD_FMT, + snprintf(ip_str, sizeof(ip_str), NIPQUAD_FMT, NIPQUAD(res->obj->ip.addr.ipv4)); else - rte_snprintf(ip_str, sizeof(ip_str), NIP6_FMT, + snprintf(ip_str, sizeof(ip_str), NIP6_FMT, NIP6(res->obj->ip.addr.ipv6)); if (strcmp(res->action, "del") == 0) { @@ -165,6 +106,7 @@ cmdline_parse_inst_t cmd_obj_del_show = { NULL, }, }; +/* >8 End of show or delete tokens. */ /**********************************************************/ @@ -176,7 +118,7 @@ struct cmd_obj_add_result { static void cmd_obj_add_parsed(void *parsed_result, struct cmdline *cl, - __attribute__((unused)) void *data) + __rte_unused void *data) { struct cmd_obj_add_result *res = parsed_result; struct object *o; @@ -195,15 +137,15 @@ static void cmd_obj_add_parsed(void *parsed_result, cmdline_printf(cl, "mem error\n"); return; } - rte_snprintf(o->name, sizeof(o->name), "%s", res->name); + strlcpy(o->name, res->name, sizeof(o->name)); o->ip = res->ip; SLIST_INSERT_HEAD(&global_obj_list, o, next); if (o->ip.family == AF_INET) - rte_snprintf(ip_str, sizeof(ip_str), NIPQUAD_FMT, + snprintf(ip_str, sizeof(ip_str), NIPQUAD_FMT, NIPQUAD(o->ip.addr.ipv4)); else - rte_snprintf(ip_str, sizeof(ip_str), NIP6_FMT, + snprintf(ip_str, sizeof(ip_str), NIP6_FMT, NIP6(o->ip.addr.ipv6)); cmdline_printf(cl, "Object %s added, ip=%s\n", @@ -235,9 +177,9 @@ struct cmd_help_result { cmdline_fixed_string_t help; }; -static void cmd_help_parsed(__attribute__((unused)) void *parsed_result, +static void cmd_help_parsed(__rte_unused void *parsed_result, struct cmdline *cl, - __attribute__((unused)) void *data) + __rte_unused void *data) { cmdline_printf(cl, "Demo example of command line interface in RTE\n\n" @@ -271,10 +213,11 @@ cmdline_parse_inst_t cmd_help = { /**********************************************************/ /****** CONTEXT (list of instruction) */ +/* Cmdline context list of commands in NULL-terminated table. 8< */ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_obj_del_show, (cmdline_parse_inst_t *)&cmd_obj_add, (cmdline_parse_inst_t *)&cmd_help, NULL, }; - +/* >8 End of context list. */