Browse Source

Remove compiler warnings

experimental/new_ui_api
Yasuo Ohgaki 24 years ago
parent
commit
fe6990cc6b
  1. 10
      ext/openssl/openssl.c
  2. 2
      ext/standard/http_fopen_wrapper.c

10
ext/openssl/openssl.c

@ -1260,7 +1260,7 @@ static int php_openssl_make_REQ(struct php_x509_request * req, X509_REQ * csr, z
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 @@ PHP_FUNCTION(openssl_csr_sign)
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 @@ PHP_FUNCTION(openssl_pkey_get_private)
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 @@ PHP_FUNCTION(openssl_private_decrypt)
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 @@ PHP_FUNCTION(openssl_public_decrypt)
zval *key, *crypted;
EVP_PKEY *pkey;
int cryptedlen;
unsigned char *cryptedbuf;
unsigned char *cryptedbuf = NULL;
unsigned char *crypttemp;
int successful = 0;
long keyresource = -1;

2
ext/standard/http_fopen_wrapper.c

@ -84,7 +84,7 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, ch
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);

Loading…
Cancel
Save