Skip to contentSkip to conversation

staging: keucr: Use memcpy() instad of custom StringCopy() and some style cleanups

PATCH In review Javier Martinez Canillas 3 participants 3 messages Dec 31, 2010 – Jan 2, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 staging: keucr: Use memcpy() instad of custom StringCopy() and some style cleanups

---
 drivers/staging/keucr/smilecc.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
drivers/staging/keucr/smilecc.c +9 -7
index daf322a..f9e515d 100644
@@ -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)
+		memcpy(calculate_ecc, redundant_ecc, 3);
+
+	if (err = 0 || err = 1 || err = 2)
+		return 0;
+	return -1;
 }
 
 void _Calculate_D_SwECC(buf,ecc)
Signature · 1 line
1.7.0.4
#1 lore raw

Re: [PATCH 2/2] staging: keucr: Use memcpy() instad of custom

Quoted 14 lines · Javier Martinez Canillas

---
 drivers/staging/keucr/smilecc.c |   16 +++++++++-------

 1 files changed, 9 insertions(+), 7 deletions(-)
drivers/staging/keucr/smilecc.c +0 -0
index daf322a..f9e515d 100644
@@ -182,13 +182,15 @@ BYTE *buf;
  BYTE *redundant_ecc;
  BYTE *calculate_ecc;
  {

drivers/staging/keucr/smilecc.c BYTE *buf; · line 187

Quoted 10 lines
drivers/staging/keucr/smilecc.c +3 -7
-    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));

Any reason why you didn't unify these 2 lines? Like this: DWORD err correct_data(...);

Quoted 17 lines
drivers/staging/keucr/smilecc.c +6 -1
+       if (err = 1)
+               memcpy(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

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Signature · 5 lines
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw

Re: [PATCH 2/2] staging: keucr: Use memcpy() instad of custom

In reply to Javier Martinez Canillas
Quoted 8 lines · Gábor Stefanik
Quoted 3 lines · Javier Martinez Canillas

+       DWORD err;
+       err = correct_data(buf, redundant_ecc, *(calculate_ecc+1),
+                          *(calculate_ecc), *(calculate_ecc+2));

Any reason why you didn't unify these 2 lines? Like this: DWORD err > correct_data(...);

These kind of things aren't described in CodingStyle so they're up to whoever writes the code to decide. Or if the maintainer is a micromanager the maintainer can decide.

But personally I much prefer to put anything complicated on separate lines. No one reads the initializers. In my work with Smatch I see a lot of bugs like this:

	int x = foo->bar;

	if (!foo)
		return -EINVAL;

It's astounding how many. The famous tun.c security bug was one of these.

But there should have been a blank line between the initializers and the code. Otherwise people will think the code is initiliazation and ignore it. That is in CodingStyle I think. We can fix that when we get rid of the DWORD data type in a later patch (don't resend).

regards,
dan carpenter

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html