From: Václav Slavík <vslavik@fastmail.fm>
Date: Sun, 29 Aug 2004 14:30:49 +0000 (+0000)
Subject: removed wx-specific fix, it's already fixed in upstream sources
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/30708139fe13859a087764ab43c9d4c8a34fc23f?ds=inline

removed wx-specific fix, it's already fixed in upstream sources


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/png/pngerror.c b/src/png/pngerror.c
index d0da28333e..656e9ea7ad 100644
--- a/src/png/pngerror.c
+++ b/src/png/pngerror.c
@@ -109,14 +109,6 @@ static PNG_CONST char png_digit[16] = {
    'A', 'B', 'C', 'D', 'E', 'F'
 };
 
-static size_t wxstrnlen( const char *s, size_t maxlen )
-{
-	size_t i ;
-	for ( i = 0 ; s[i] && i < maxlen ; ++i )
-		;
-	return i ;
-}
-
 static void /* PRIVATE */
 png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
    error_message)
@@ -143,12 +135,10 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
       buffer[iout] = 0;
    else
    {
-      int len = wxstrnlen(error_message, 64);
- 
       buffer[iout++] = ':';
       buffer[iout++] = ' ';
-      png_strncpy(buffer+iout, error_message, len);
-      buffer[iout+len] = 0;
+      png_strncpy(buffer+iout, error_message, 63);
+      buffer[iout+63] = 0;
    }
 }