Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:33409
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain petdance.com from 69.17.117.6 cause and error)
Date: Fri, 23 Nov 2007 23:09:58 -0600
To: internals@lists.php.net
Message-ID: <20071124050958.GA14940@petdance.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="X1bOJ3K7DJ5YkBrT"
Content-Disposition: inline
User-Agent: Mutt/1.4.2.2i
Subject: [PATCH] Constifying ext/standard/md5.c
From: andy@petdance.com (Andy Lester)

--X1bOJ3K7DJ5YkBrT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Here's some patchy goodness to constify the input args to the md5
functions.

xoxo,
Andy


-- 
Andy Lester => andy@petdance.com => www.petdance.com => AIM:petdance

--X1bOJ3K7DJ5YkBrT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="md5.patch"

Index: ext/standard/md5.c
===================================================================
--- ext/standard/md5.c	(revision 1)
+++ ext/standard/md5.c	(working copy)
@@ -26,12 +26,12 @@
 #include "php.h"
 #include "md5.h"
 
-PHPAPI void make_digest(char *md5str, unsigned char *digest)
+PHPAPI void make_digest(char *md5str, const unsigned char *digest)
 {
 	make_digest_ex(md5str, digest, 16);
 }
 
-PHPAPI void make_digest_ex(char *md5str, unsigned char *digest, int len)
+PHPAPI void make_digest_ex(char *md5str, const unsigned char *digest, int len)
 {
 	static const char hexits[17] = "0123456789abcdef";
 	int i;
@@ -168,8 +168,8 @@
 #define S44 21
 
 static void MD5Transform(php_uint32[4], const unsigned char[64]);
-static void Encode(unsigned char *, php_uint32 *, unsigned int);
-static void Decode(php_uint32 *, const unsigned char *, unsigned int);
+static void Encode(unsigned char *output, const php_uint32 *input, size_t len);
+static void Decode(php_uint32 *output, const unsigned char *input, size_t len);
 
 static unsigned char PADDING[64] =
 {
@@ -397,10 +397,7 @@
    Encodes input (php_uint32) into output (unsigned char). Assumes len is
    a multiple of 4.
  */
-static void Encode(output, input, len)
-unsigned char *output;
-php_uint32 *input;
-unsigned int len;
+static void Encode(unsigned char *output, const php_uint32 *input, size_t len)
 {
 	unsigned int i, j;
 
@@ -417,10 +414,7 @@
    Decodes input (unsigned char) into output (php_uint32). Assumes len is
    a multiple of 4.
  */
-static void Decode(output, input, len)
-php_uint32 *output;
-const unsigned char *input;
-unsigned int len;
+static void Decode(php_uint32 *output, const unsigned char *input, size_t len)
 {
 	unsigned int i, j;
 
Index: ext/standard/md5.h
===================================================================
--- ext/standard/md5.h	(revision 1)
+++ ext/standard/md5.h	(working copy)
@@ -54,8 +54,8 @@
 	unsigned char buffer[64];	/* input buffer */
 } PHP_MD5_CTX;
 
-PHPAPI void make_digest(char *md5str, unsigned char *digest);
-PHPAPI void make_digest_ex(char *md5str, unsigned char *digest, int len);
+PHPAPI void make_digest(char *md5str, const unsigned char *digest);
+PHPAPI void make_digest_ex(char *md5str, const unsigned char *digest, int len);
 PHPAPI void PHP_MD5Init(PHP_MD5_CTX *);
 PHPAPI void PHP_MD5Update(PHP_MD5_CTX *, const unsigned char *, unsigned int);
 PHPAPI void PHP_MD5Final(unsigned char[16], PHP_MD5_CTX *);

--X1bOJ3K7DJ5YkBrT--