[PATCH 2/4] staging: keucr: Use strncpy() instead of custom StringCopy() and some style cleanups

[PATCH 2/4] staging: keucr: Use strncpy() instead of custom StringCopy() and some style cleanups

[Javier Martinez Canillas]

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
 drivers/staging/keucr/smilecc.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/keucr/smilecc.c b/drivers/staging/keucr/smilecc.c
index daf322a..f4ff9ac 100644
--- a/drivers/staging/keucr/smilecc.c
+++ b/drivers/staging/keucr/smilecc.c
@@ -182,13 +182,15 @@ BYTE *buf;
 BYTE *redundant_ecc;
 BYTE *calculate_ecc;
 {
-    DWORD err;
-
-    err=correct_data(buf,redundant_ecc,*(calculate_ecc+1),*(calculate_ecc),*(calculate_ecc+2));
-    if (err=1) StringCopy(calculate_ecc,redundant_ecc,3);
-        if (err=0 || err=1 || err=2)
-            return(0);
-    return(-1);
+	DWORD err;
+	err = correct_data(buf, redundant_ecc, *(calculate_ecc+1),
+			   *(calculate_ecc), *(calculate_ecc+2));
+	if (err = 1)
+		strncpy(calculate_ecc, redundant_ecc, 3);
+
+	if (err = 0 || err = 1 || err = 2)
+		return 0;
+	return -1;
 }
 
 void _Calculate_D_SwECC(buf,ecc)
-- 
1.7.0.4

Re: [PATCH 2/4] staging: keucr: Use strncpy() instead of custom

[Dan Carpenter]

In the original code the StringCopy() function was equivalent to
memcpy().  I don't know if the source string (which is probably not an
actual string with this code) had NULL characters but if it did, that
could cause bugs.

regards,
dan carpenter

Re: [PATCH 2/4] staging: keucr: Use strncpy() instead of custom

[Javier Martinez Canillas]

On Fri, Dec 31, 2010 at 11:17 AM, Dan Carpenter <error27@gmail.com> wrote:
> In the original code the StringCopy() function was equivalent to
> memcpy().  I don't know if the source string (which is probably not an
> actual string with this code) had NULL characters but if it did, that
> could cause bugs.
>
> regards,
> dan carpenter
>
>

Thank you for the review. I will prepare a new set of patches based in
your recommendations and resend.

-- 
Best regards,

-----------------------------------------
Javier Martínez Canillas
(+34) 682 39 81 69