cvs: php4 /ext/openssl openssl.c /ext/standard http_fopen_wrapper.c

yohgaki Fri Apr 19 03:56:43 2002 EDT Modified files: /php4/ext/openssl openssl.c /php4/ext/standard http_fopen_wrapper.c Log: Remove compiler warnings Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.44 php4/ext/openssl/openssl.c:1.45 --- php4/ext/openssl/openssl.c:1.44 Fri Apr 12 15:26:07 2002 +++ php4/ext/openssl/openssl.c Fri Apr 19 03:56:40 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.44 2002/04/12 19:26:07 wez Exp $ */ +/* $Id: openssl.c,v 1.45 2002/04/19 07:56:40 yohgaki Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1260,7 +1260,7 @@ static X509_REQ * php_openssl_csr_from_zval(zval ** val, int makeresource, long * resourceval TSRMLS_DC) { X509_REQ * csr = NULL; - char * filename; + char * filename = NULL; BIO * in; if (resourceval) @@ -1386,7 +1386,7 @@ long num_days; X509 * cert = NULL, *new_cert = NULL; X509_REQ * csr; - EVP_PKEY * key, *priv_key; + EVP_PKEY * key = NULL, *priv_key; long csr_resource, certresource, keyresource; int i; struct php_x509_request req; @@ -1938,7 +1938,7 @@ Verifys that the data block is intact, the signer is who they say they are, and returns the CERTs of the signers */ PHP_FUNCTION(openssl_pkcs7_verify) { - X509_STORE * store; + X509_STORE * store = NULL; zval * cainfo = NULL; STACK_OF(X509) *signers= NULL; STACK_OF(X509) *others = NULL; @@ -2367,7 +2367,7 @@ zval *key, *crypted; EVP_PKEY *pkey; int cryptedlen; - unsigned char *cryptedbuf; + unsigned char *cryptedbuf = NULL; unsigned char *crypttemp; int successful = 0; long padding = RSA_PKCS1_PADDING; @@ -2487,7 +2487,7 @@ zval *key, *crypted; EVP_PKEY *pkey; int cryptedlen; - unsigned char *cryptedbuf; + unsigned char *cryptedbuf = NULL; unsigned char *crypttemp; int successful = 0; long keyresource = -1; Index: php4/ext/standard/http_fopen_wrapper.c diff -u php4/ext/standard/http_fopen_wrapper.c:1.32 php4/ext/standard/http_fopen_wrapper.c:1.33 --- php4/ext/standard/http_fopen_wrapper.c:1.32 Tue Apr 16 18:14:23 2002 +++ php4/ext/standard/http_fopen_wrapper.c Fri Apr 19 03:56:40 2002 @@ -18,7 +18,7 @@ | Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: http_fopen_wrapper.c,v 1.32 2002/04/16 22:14:23 wez Exp $ */ +/* $Id: http_fopen_wrapper.c,v 1.33 2002/04/19 07:56:40 yohgaki Exp $ */ #include "php.h" #include "php_globals.h" @@ -84,7 +84,7 @@ int reqok = 0; char *http_header_line = NULL; char tmp_line[128]; - size_t chunk_size, file_size = 0; + size_t chunk_size = 0, file_size = 0; int redirected = 0; resource = php_url_parse(path);