Author: dim
Date: Sat Dec 17 01:29:46 2011
New Revision: 228615
URL: http://svn.freebsd.org/changeset/base/228615
Log:
In sbin/dhclient, since we know the size of the source strings anyway,
we might as well use memcpy; strlcpy is really unnecessary here.
MFC after: 1 week
Modified:
head/sbin/dhclient/clparse.c
head/sbin/dhclient/parse.c
Modified: head/sbin/dhclient/clparse.c
==============================================================================
--- head/sbin/dhclient/clparse.c Sat Dec 17 01:19:07 2011
(r228614)
+++ head/sbin/dhclient/clparse.c Sat Dec 17 01:29:46 2011
(r228615)
@@ -895,7 +895,7 @@ parse_string_list(FILE *cfile, struct st
tmp = new_string_list(valsize);
if (tmp == NULL)
error("no memory for string list entry.");
- strlcpy(tmp->string, val, valsize);
+ memcpy(tmp->string, val, valsize);
tmp->next = NULL;
/* Store this medium at the end of the media list. */
Modified: head/sbin/dhclient/parse.c
==============================================================================
--- head/sbin/dhclient/parse.c Sat Dec 17 01:19:07 2011 (r228614)
+++ head/sbin/dhclient/parse.c Sat Dec 17 01:29:46 2011 (r228615)
@@ -129,7 +129,7 @@ parse_string(FILE *cfile)
s = malloc(valsize);
if (!s)
error("no memory for string %s.", val);
- strlcpy(s, val, valsize);
+ memcpy(s, val, valsize);
if (!parse_semi(cfile))
return (NULL);
@@ -295,7 +295,7 @@ parse_numeric_aggregate(FILE *cfile, uns
t = malloc(valsize);
if (!t)
error("no temp space for number.");
- strlcpy(t, val, valsize);
+ memcpy(t, val, valsize);
c = cons(t, c);
}
} while (++count != *max);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
