X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=app%2Ftest%2Ftest_cmdline_portlist.c;h=b9664b0ed68b26059154db86bcb607502ddf032a;hb=922a5466c10024e8d1599deb0f4754fca1165ea7;hp=cfd88e5dfcde923b01f4e9f440066416848f970f;hpb=b6df9fc8715f9a925136006b18fdd65f9c621757;p=dpdk.git diff --git a/app/test/test_cmdline_portlist.c b/app/test/test_cmdline_portlist.c index cfd88e5dfc..b9664b0ed6 100644 --- a/app/test/test_cmdline_portlist.c +++ b/app/test/test_cmdline_portlist.c @@ -1,35 +1,34 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. + * + * Copyright(c) 2010-2014 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 + * + * 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 + * + * * 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 + * * 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 + * * 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 + * + * 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. - * */ #include @@ -140,21 +139,22 @@ test_parse_portlist_invalid_param(void) memset(&result, 0, sizeof(cmdline_portlist_t)); /* try all null */ - ret = cmdline_parse_portlist(NULL, NULL, NULL); + ret = cmdline_parse_portlist(NULL, NULL, NULL, 0); if (ret != -1) { printf("Error: parser accepted null parameters!\n"); return -1; } /* try null buf */ - ret = cmdline_parse_portlist(NULL, NULL, (void*)&result); + ret = cmdline_parse_portlist(NULL, NULL, (void*)&result, + sizeof(result)); if (ret != -1) { printf("Error: parser accepted null string!\n"); return -1; } /* try null result */ - ret = cmdline_parse_portlist(NULL, portlist_valid_strs[0].str, NULL); + ret = cmdline_parse_portlist(NULL, portlist_valid_strs[0].str, NULL, 0); if (ret == -1) { printf("Error: parser rejected null result!\n"); return -1; @@ -165,13 +165,6 @@ test_parse_portlist_invalid_param(void) /* test help function */ - /* try null buf */ - ret = cmdline_get_help_portlist(NULL, NULL, sizeof(buf)); - if (ret != -1) { - printf("Error: help function accepted null buffer!\n"); - return -1; - } - /* coverage! */ ret = cmdline_get_help_portlist(NULL, buf, sizeof(buf)); if (ret < 0) { @@ -196,7 +189,7 @@ test_parse_portlist_invalid_data(void) memset(&result, 0, sizeof(cmdline_portlist_t)); ret = cmdline_parse_portlist(NULL, portlist_invalid_strs[i], - (void*)&result); + (void*)&result, sizeof(result)); if (ret != -1) { printf("Error: parsing %s succeeded!\n", portlist_invalid_strs[i]); @@ -221,7 +214,7 @@ test_parse_portlist_valid(void) memset(&result, 0, sizeof(cmdline_portlist_t)); ret = cmdline_parse_portlist(NULL, portlist_valid_strs[i].str, - (void*)&result); + (void*)&result, sizeof(result)); if (ret < 0) { printf("Error: parsing %s failed!\n", portlist_valid_strs[i].str); @@ -240,7 +233,7 @@ test_parse_portlist_valid(void) memset(&result, 0, sizeof(cmdline_portlist_t)); ret = cmdline_parse_portlist(NULL, portlist_garbage_strs[i], - (void*)&result); + (void*)&result, sizeof(result)); if (ret < 0) { printf("Error: parsing %s failed!\n", portlist_garbage_strs[i]);