[PATCH] test-hexdump: test the return value of the hex_dump_to_buffer

[PATCH] test-hexdump: test the return value of the hex_dump_to_buffer

[Wang Long]

As the function hex_dump_to_buffer returns the amount of bytes placed
in the buffer without terminating NUL. the test-hexdump should test
the return value of it.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
---
 lib/test-hexdump.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
index daf29a39..9243be7 100644
--- a/lib/test-hexdump.c
+++ b/lib/test-hexdump.c
@@ -52,8 +52,9 @@ static void __init test_hexdump(size_t len, int rowsize, int groupsize,
 	size_t l = len;
 	int gs = groupsize, rs = rowsize;
 	unsigned int i;
+	int r;
 
-	hex_dump_to_buffer(data_b, l, rs, gs, real, sizeof(real), ascii);
+	r = hex_dump_to_buffer(data_b, l, rs, gs, real, sizeof(real), ascii);
 
 	if (rs != 16 && rs != 32)
 		rs = 16;
@@ -96,7 +97,7 @@ static void __init test_hexdump(size_t len, int rowsize, int groupsize,
 
 	*p = '\0';
 
-	if (strcmp(test, real)) {
+	if (strcmp(test, real) || r != strlen(real)) {
 		pr_err("Len: %zu row: %d group: %d\n", len, rowsize, groupsize);
 		pr_err("Result: '%s'\n", real);
 		pr_err("Expect: '%s'\n", test);
-- 
1.8.3.4

Re: [PATCH] test-hexdump: test the return value of the hex_dump_to_buffer

[Andy Shevchenko]

On Sun, 2015-02-15 at 09:50 +0000, Wang Long wrote:
> As the function hex_dump_to_buffer returns the amount of bytes placed
> in the buffer without terminating NUL. the test-hexdump should test
> the return value of it.

I don't think it's needed. When the prototype was changed the new test
case had been introduced to cover the overflow cases, i.e.
test_hexdump_overflow().

> 
> Signed-off-by: Wang Long <long.wanglong@huawei.com>
> ---
>  lib/test-hexdump.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
> index daf29a39..9243be7 100644
> --- a/lib/test-hexdump.c
> +++ b/lib/test-hexdump.c
> @@ -52,8 +52,9 @@ static void __init test_hexdump(size_t len, int rowsize, int groupsize,
>  	size_t l = len;
>  	int gs = groupsize, rs = rowsize;
>  	unsigned int i;
> +	int r;
>  
> -	hex_dump_to_buffer(data_b, l, rs, gs, real, sizeof(real), ascii);
> +	r = hex_dump_to_buffer(data_b, l, rs, gs, real, sizeof(real), ascii);
>  
>  	if (rs != 16 && rs != 32)
>  		rs = 16;
> @@ -96,7 +97,7 @@ static void __init test_hexdump(size_t len, int rowsize, int groupsize,
>  
>  	*p = '\0';
>  
> -	if (strcmp(test, real)) {
> +	if (strcmp(test, real) || r != strlen(real)) {
>  		pr_err("Len: %zu row: %d group: %d\n", len, rowsize, groupsize);
>  		pr_err("Result: '%s'\n", real);
>  		pr_err("Expect: '%s'\n", test);


-- 
Andy Shevchenko <andriy.shevchenko@intel.com>
Intel Finland Oy

Re: [PATCH] test-hexdump: test the return value of the hex_dump_to_buffer

[long.wanglong]

On 2015/2/16 17:47, Andy Shevchenko wrote:
> On Sun, 2015-02-15 at 09:50 +0000, Wang Long wrote:
>> As the function hex_dump_to_buffer returns the amount of bytes placed
>> in the buffer without terminating NUL. the test-hexdump should test
>> the return value of it.
> 
> I don't think it's needed. When the prototype was changed the new test
> case had been introduced to cover the overflow cases, i.e.
> test_hexdump_overflow().
> 

ok, thanks.

>>
>> Signed-off-by: Wang Long <long.wanglong@huawei.com>
>> ---
>>  lib/test-hexdump.c | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
>> index daf29a39..9243be7 100644
>> --- a/lib/test-hexdump.c
>> +++ b/lib/test-hexdump.c
>> @@ -52,8 +52,9 @@ static void __init test_hexdump(size_t len, int rowsize, int groupsize,
>>  	size_t l = len;
>>  	int gs = groupsize, rs = rowsize;
>>  	unsigned int i;
>> +	int r;
>>  
>> -	hex_dump_to_buffer(data_b, l, rs, gs, real, sizeof(real), ascii);
>> +	r = hex_dump_to_buffer(data_b, l, rs, gs, real, sizeof(real), ascii);
>>  
>>  	if (rs != 16 && rs != 32)
>>  		rs = 16;
>> @@ -96,7 +97,7 @@ static void __init test_hexdump(size_t len, int rowsize, int groupsize,
>>  
>>  	*p = '\0';
>>  
>> -	if (strcmp(test, real)) {
>> +	if (strcmp(test, real) || r != strlen(real)) {
>>  		pr_err("Len: %zu row: %d group: %d\n", len, rowsize, groupsize);
>>  		pr_err("Result: '%s'\n", real);
>>  		pr_err("Expect: '%s'\n", test);
> 
>