X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_cmdline_etheraddr.c;h=e4f42317f215f4b702bda5755d9846009cd63a07;hb=dd0eedb1cfcf0cb7423d859177c5bc6f931eaf8a;hp=443717be4f8cb4bdb10ebf55f0918f78553f0586;hpb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;p=dpdk.git diff --git a/app/test/test_cmdline_etheraddr.c b/app/test/test_cmdline_etheraddr.c index 443717be4f..e4f42317f2 100644 --- a/app/test/test_cmdline_etheraddr.c +++ b/app/test/test_cmdline_etheraddr.c @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * + * * 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 * 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 @@ -17,7 +17,7 @@ * * 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 @@ -130,14 +130,15 @@ test_parse_etheraddr_invalid_param(void) int ret = 0; /* try all null */ - ret = cmdline_parse_etheraddr(NULL, NULL, NULL); + ret = cmdline_parse_etheraddr(NULL, NULL, NULL, 0); if (ret != -1) { printf("Error: parser accepted null parameters!\n"); return -1; } /* try null buf */ - ret = cmdline_parse_etheraddr(NULL, NULL, (void*)&result); + ret = cmdline_parse_etheraddr(NULL, NULL, (void*)&result, + sizeof(result)); if (ret != -1) { printf("Error: parser accepted null string!\n"); return -1; @@ -146,10 +147,10 @@ test_parse_etheraddr_invalid_param(void) /* try null result */ /* copy string to buffer */ - rte_snprintf(buf, sizeof(buf), "%s", - ether_addr_valid_strs[0]); + snprintf(buf, sizeof(buf), "%s", + ether_addr_valid_strs[0].str); - ret = cmdline_parse_etheraddr(NULL, buf, NULL); + ret = cmdline_parse_etheraddr(NULL, buf, NULL, 0); if (ret == -1) { printf("Error: parser rejected null result!\n"); return -1; @@ -161,13 +162,6 @@ test_parse_etheraddr_invalid_param(void) /* test help function */ memset(&buf, 0, sizeof(buf)); - /* try null buf */ - ret = cmdline_get_help_etheraddr(NULL, NULL, sizeof(buf)); - if (ret != -1) { - printf("Error: help function accepted null buffer!\n"); - return -1; - } - /* coverage! */ ret = cmdline_get_help_etheraddr(NULL, buf, sizeof(buf)); if (ret < 0) { @@ -192,7 +186,7 @@ test_parse_etheraddr_invalid_data(void) memset(&result, 0, sizeof(struct ether_addr)); ret = cmdline_parse_etheraddr(NULL, ether_addr_invalid_strs[i], - (void*)&result); + (void*)&result, sizeof(result)); if (ret != -1) { printf("Error: parsing %s succeeded!\n", ether_addr_invalid_strs[i]); @@ -217,7 +211,7 @@ test_parse_etheraddr_valid(void) memset(&result, 0, sizeof(struct ether_addr)); ret = cmdline_parse_etheraddr(NULL, ether_addr_valid_strs[i].str, - (void*)&result); + (void*)&result, sizeof(result)); if (ret < 0) { printf("Error: parsing %s failed!\n", ether_addr_valid_strs[i].str); @@ -236,7 +230,7 @@ test_parse_etheraddr_valid(void) memset(&result, 0, sizeof(struct ether_addr)); ret = cmdline_parse_etheraddr(NULL, ether_addr_garbage_strs[i], - (void*)&result); + (void*)&result, sizeof(result)); if (ret < 0) { printf("Error: parsing %s failed!\n", ether_addr_garbage_strs[i]);