Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c68bd4d9 authored by Linus Torvalds's avatar Linus Torvalds Committed by ssizon
Browse files

unifdef: use memcpy instead of strncpy 



commit 38c7b224ce22c25fed04007839edf974bd13439d upstream.

New versions of gcc reasonably warn about the odd pattern of

	strncpy(p, q, strlen(q));

which really doesn't make sense: the strncpy() ends up being just a slow
and odd way to write memcpy() in this case.

There was a comment about _why_ the code used strncpy - to avoid the
terminating NUL byte, but memcpy does the same and avoids the warning.

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd94087f

scripts/unifdef.c

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ usage(void) 
 * When we have processed a group that starts off with a known-false

 * #if/#elif sequence (which has therefore been deleted) followed by a

 * #elif that we don't understand and therefore must keep, we edit the

 * latter into a #if to keep the nesting correct. We use strncpy() to

 * latter into a #if to keep the nesting correct. We use memcpy() to

 * overwrite the 4 byte token "elif" with "if  " without a '\0' byte.

 *

 * When we find a true #elif in a group, the following block will
@@ -450,7 +450,7 @@ static void Idrop (void) { Fdrop(); ignoreon(); } 
static void Itrue (void) { Ftrue();  ignoreon(); }

static void Ifalse(void) { Ffalse(); ignoreon(); }

/* modify this line */

static void Mpass (void) { strncpy(keyword, "if  ", 4); Pelif(); }

static void Mpass (void) { memcpy(keyword, "if  ", 4); Pelif(); }

static void Mtrue (void) { keywordedit("else");  state(IS_TRUE_MIDDLE); }

static void Melif (void) { keywordedit("endif"); state(IS_FALSE_TRAILER); }

static void Melse (void) { keywordedit("endif"); state(IS_FALSE_ELSE); }