svn: /php/php-src/trunk/main/ SAPI.c main.c rfc1867.c snprintf.c streams/glob_wrapper.c

kalle Tue, 17 Aug 2010 12:49:19 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=302387 Log: Fixed compiler warnings in main/ Changed paths: U php/php-src/trunk/main/SAPI.c U php/php-src/trunk/main/main.c U php/php-src/trunk/main/rfc1867.c U php/php-src/trunk/main/snprintf.c U php/php-src/trunk/main/streams/glob_wrapper.c Modified: php/php-src/trunk/main/SAPI.c =================================================================== --- php/php-src/trunk/main/SAPI.c 2010-08-17 12:17:28 UTC (rev 302386) +++ php/php-src/trunk/main/SAPI.c 2010-08-17 12:49:19 UTC (rev 302387) @@ -570,7 +570,6 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC) { - int retval; sapi_header_struct sapi_header; char *colon_offset; long myuid = 0L; Modified: php/php-src/trunk/main/main.c =================================================================== --- php/php-src/trunk/main/main.c 2010-08-17 12:17:28 UTC (rev 302386) +++ php/php-src/trunk/main/main.c 2010-08-17 12:49:19 UTC (rev 302387) @@ -1621,7 +1621,7 @@ zend_bool send_buffer = SG(request_info).headers_only ? 0 : 1; if (CG(unclean_shutdown) && PG(last_error_type) == E_ERROR && - PG(memory_limit) < zend_memory_usage(1 TSRMLS_CC) + (size_t)PG(memory_limit) < zend_memory_usage(1 TSRMLS_CC) ) { send_buffer = 0; } Modified: php/php-src/trunk/main/rfc1867.c =================================================================== --- php/php-src/trunk/main/rfc1867.c 2010-08-17 12:17:28 UTC (rev 302386) +++ php/php-src/trunk/main/rfc1867.c 2010-08-17 12:49:19 UTC (rev 302387) @@ -769,7 +769,7 @@ int fd = -1; zend_llist header; void *event_extra_data = NULL; - int llen = 0; + unsigned int llen = 0; int upload_cnt = INI_INT("max_file_uploads"); if (SG(post_max_size) > 0 && SG(request_info).content_length > SG(post_max_size)) { @@ -1066,12 +1066,12 @@ } } - if (PG(upload_max_filesize) > 0 && (total_bytes+blen) > PG(upload_max_filesize)) { + if (PG(upload_max_filesize) > 0 && (long)(total_bytes+blen) > PG(upload_max_filesize)) { #if DEBUG_FILE_UPLOAD sapi_module.sapi_error(E_NOTICE, "upload_max_filesize of %ld bytes exceeded - file [%s=%s] not saved", PG(upload_max_filesize), param, filename); #endif cancel_upload = UPLOAD_ERROR_A; - } else if (max_file_size && ((total_bytes+blen) > max_file_size)) { + } else if (max_file_size && ((long)(total_bytes+blen) > max_file_size)) { #if DEBUG_FILE_UPLOAD sapi_module.sapi_error(E_NOTICE, "MAX_FILE_SIZE of %ld bytes exceeded - file [%s=%s] not saved", max_file_size, param, filename); #endif Modified: php/php-src/trunk/main/snprintf.c =================================================================== --- php/php-src/trunk/main/snprintf.c 2010-08-17 12:17:28 UTC (rev 302386) +++ php/php-src/trunk/main/snprintf.c 2010-08-17 12:49:19 UTC (rev 302387) @@ -1220,7 +1220,7 @@ PHPAPI int ap_php_slprintf(char *buf, size_t len, const char *format,...) /* {{{ */ { - int cc; + unsigned int cc; va_list ap; va_start(ap, format); @@ -1236,7 +1236,7 @@ PHPAPI int ap_php_vslprintf(char *buf, size_t len, const char *format, va_list ap) /* {{{ */ { - int cc; + unsigned int cc; strx_printv(&cc, buf, len, format, ap); if (cc >= len) { Modified: php/php-src/trunk/main/streams/glob_wrapper.c =================================================================== --- php/php-src/trunk/main/streams/glob_wrapper.c 2010-08-17 12:17:28 UTC (rev 302386) +++ php/php-src/trunk/main/streams/glob_wrapper.c 2010-08-17 12:49:19 UTC (rev 302387) @@ -144,7 +144,7 @@ /* avoid problems if someone mis-uses the stream */ if (count == sizeof(php_stream_dirent) && pglob) { - if (pglob->index < pglob->glob.gl_pathc) { + if (pglob->index < (size_t)pglob->glob.gl_pathc) { php_glob_stream_path_split(pglob, pglob->glob.gl_pathv[pglob->index++], pglob->flags & GLOB_APPEND, &path TSRMLS_CC); PHP_STRLCPY(ent->d_name, path, sizeof(ent->d_name), strlen(path)); return sizeof(php_stream_dirent);