You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ji...@apache.org on 2013/10/17 17:23:26 UTC
svn commit: r1533112 - in /apr/apr/branches/1.5.x: ./ strings/apr_cpystrn.c
Author: jim
Date: Thu Oct 17 15:23:26 2013
New Revision: 1533112
URL: http://svn.apache.org/r1533112
Log:
Merge r1533111 from trunk:
make sure d is inited
Reviewed/backported by: jim
Modified:
apr/apr/branches/1.5.x/ (props changed)
apr/apr/branches/1.5.x/strings/apr_cpystrn.c
Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1533111
Modified: apr/apr/branches/1.5.x/strings/apr_cpystrn.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/strings/apr_cpystrn.c?rev=1533112&r1=1533111&r2=1533112&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/strings/apr_cpystrn.c (original)
+++ apr/apr/branches/1.5.x/strings/apr_cpystrn.c Thu Oct 17 15:23:26 2013
@@ -46,14 +46,13 @@
APR_DECLARE(char *) apr_cpystrn(char *dst, const char *src, apr_size_t dst_size)
{
- char *d, *end;
+ char *d = dst, *end;
if (dst_size == 0) {
return (dst);
}
if (src) {
- d = dst;
end = dst + dst_size - 1;
for (; d < end; ++d, ++src) {