]> granicus.if.org Git - php/commitdiff
fix datatype mismatches
authorAnatol Belski <ab@php.net>
Mon, 1 Dec 2014 13:30:02 +0000 (14:30 +0100)
committerAnatol Belski <ab@php.net>
Tue, 2 Dec 2014 08:15:08 +0000 (09:15 +0100)
sapi/cgi/cgi_main.c

index 224239c7a026d21a22177d5be9aab7e24568d739..23374e79d9df0e1e4c3a6a4d318581834cdf461e 100644 (file)
@@ -1735,7 +1735,8 @@ int main(int argc, char *argv[])
 {
        int free_query_string = 0;
        int exit_status = SUCCESS;
-       int cgi = 0, c, i, len;
+       int cgi = 0, c, i;
+       size_t len;
        zend_file_handle file_handle;
        char *s;
 
@@ -1745,7 +1746,7 @@ int main(int argc, char *argv[])
        int orig_optind = php_optind;
        char *orig_optarg = php_optarg;
        char *script_file = NULL;
-       int ini_entries_len = 0;
+       size_t ini_entries_len = 0;
        /* end of temporary locals */
 
 #ifdef ZTS
@@ -1849,7 +1850,7 @@ int main(int argc, char *argv[])
                                break;
                        case 'd': {
                                /* define ini entries on command line */
-                               int len = strlen(php_optarg);
+                               size_t len = strlen(php_optarg);
                                char *val;
 
                                if ((val = strchr(php_optarg, '='))) {
@@ -2290,7 +2291,7 @@ consult the installation file that came with this distribution, or visit \n\
                                 *  test.php v1=test "v2=hello world!"
                                */
                                if (!SG(request_info).query_string && argc > php_optind) {
-                                       int slen = strlen(PG(arg_separator).input);
+                                       size_t slen = strlen(PG(arg_separator).input);
                                        len = 0;
                                        for (i = php_optind; i < argc; i++) {
                                                if (i < (argc - 1)) {