Changed prototypes to allow parsing of string literals and constant strings

Minor CS/WS

diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index 20cccb469fe42a6bea019233ad0574f02468dd06..533a98c505ae542ceeb16af453b515f7d66a729f 100644 (file)
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -125,7 +125,7 @@ static php_stream *php_ftp_fopen_connect(php_stream_wrapper *wrapper, char *path
        char *scratch;
        char tmp_line[512];
 
-       resource = php_url_parse((char *) path);
+       resource = php_url_parse(path);
        if (resource == NULL || resource->path == NULL)
                return NULL;
 

diff --git a/ext/standard/url.c b/ext/standard/url.c
index afd5eba540379c17a8fad08680f119581a8bffa3..a5f6d449111e583b10eae4e4469a182ba8ec4436 100644 (file)
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -83,12 +83,12 @@ PHPAPI char *php_replace_controlchars(char *str)
 
 /* {{{ php_url_parse
  */
-PHPAPI php_url *php_url_parse(char *str)
+PHPAPI php_url *php_url_parse(char const *str)
 {
        int length = strlen(str);
        char port_buf[5];
        php_url *ret = ecalloc(1, sizeof(php_url));
-       char *s, *e, *p, *pp, *ue;
+       char const *s, *e, *p, *pp, *ue;
                
        s = str;
        ue = s + length;
@@ -371,11 +371,11 @@ static unsigned char hexchars[] = "0123456789ABCDEF";
 
 /* {{{ php_url_encode
  */
-PHPAPI char *php_url_encode(char *s, int len, int *new_length)
+PHPAPI char *php_url_encode(char const *s, int len, int *new_length)
 {
        register unsigned char c;
-       unsigned char *to, *from, *start;
-       unsigned char *end;
+       unsigned char *to, *start;
+       unsigned char const *from, *end;
        
        from = s;
        end = s + len;
@@ -392,15 +392,15 @@ PHPAPI char *php_url_encode(char *s, int len, int *new_length)
                                   (c > 'Z' && c < 'a' && c != '_') ||
                                   (c > 'z')) {
                        to[0] = '%';
-                       to[1] = hexchars[(unsigned char) c >> 4];
-                       to[2] = hexchars[(unsigned char) c & 15];
+                       to[1] = hexchars[c >> 4];
+                       to[2] = hexchars[c & 15];
                        to += 3;
 #else /*CHARSET_EBCDIC*/
                } else if (!isalnum(c) && strchr("_-.", c) == NULL) {
                        /* Allow only alphanumeric chars and '_', '-', '.'; escape the rest */
                        to[0] = '%';
-                       to[1] = hexchars[os_toascii[(unsigned char) c] >> 4];
-                       to[2] = hexchars[os_toascii[(unsigned char) c] & 15];
+                       to[1] = hexchars[os_toascii[c] >> 4];
+                       to[2] = hexchars[os_toascii[c] & 15];
                        to += 3;
 #endif /*CHARSET_EBCDIC*/
                } else {
@@ -459,9 +459,11 @@ PHPAPI int php_url_decode(char *str, int len)
        char *data = str;
 
        while (len--) {
-               if (*data == '+')
+               if (*data == '+') {
                        *dest = ' ';
-               else if (*data == '%' && len >= 2 && isxdigit((int) *(data + 1)) && isxdigit((int) *(data + 2))) {
+               }
+               else if (*data == '%' && len >= 2 && isxdigit((int) *(data + 1)) && isxdigit((int) *(data + 2))) 
+               {
 #ifndef CHARSET_EBCDIC
                        *dest = (char) php_htoi(data + 1);
 #else
@@ -469,8 +471,9 @@ PHPAPI int php_url_decode(char *str, int len)
 #endif
                        data += 2;
                        len -= 2;
-               } else
+               } else {
                        *dest = *data;
+               }
                data++;
                dest++;
        }
@@ -481,7 +484,7 @@ PHPAPI int php_url_decode(char *str, int len)
 
 /* {{{ php_raw_url_encode
  */
-PHPAPI char *php_raw_url_encode(char *s, int len, int *new_length)
+PHPAPI char *php_raw_url_encode(char const *s, int len, int *new_length)
 {
        register int x, y;
        unsigned char *str;
@@ -557,7 +560,8 @@ PHPAPI int php_raw_url_decode(char *str, int len)
        char *data = str;
 
        while (len--) {
-               if (*data == '%' && len >= 2 && isxdigit((int) *(data + 1)) && isxdigit((int) *(data + 2))) {
+               if (*data == '%' && len >= 2 && isxdigit((int) *(data + 1)) && isxdigit((int) *(data + 2))) 
+               {
 #ifndef CHARSET_EBCDIC
                        *dest = (char) php_htoi(data + 1);
 #else
@@ -565,8 +569,9 @@ PHPAPI int php_raw_url_decode(char *str, int len)
 #endif
                        data += 2;
                        len -= 2;
-               } else
+               } else {
                        *dest = *data;
+               }
                data++;
                dest++;
        }

diff --git a/ext/standard/url.h b/ext/standard/url.h
index 2492ca01747baa62c13c62993dc7b35fe02155d9..709e830c2672c5fbf29d95c8686aa38ce4669698 100644 (file)
--- a/ext/standard/url.h
+++ b/ext/standard/url.h
@@ -32,11 +32,11 @@ typedef struct php_url {
 } php_url;
 
 PHPAPI void php_url_free(php_url *theurl);
-PHPAPI php_url *php_url_parse(char *str);
+PHPAPI php_url *php_url_parse(char const *str);
 PHPAPI int php_url_decode(char *str, int len); /* return value: length of decoded string */
 PHPAPI int php_raw_url_decode(char *str, int len); /* return value: length of decoded string */
-PHPAPI char *php_url_encode(char *s, int len, int *new_length);
-PHPAPI char *php_raw_url_encode(char *s, int len, int *new_length);
+PHPAPI char *php_url_encode(char const *s, int len, int *new_length);
+PHPAPI char *php_raw_url_encode(char const *s, int len, int *new_length);
 
 PHP_FUNCTION(parse_url);
 PHP_FUNCTION(urlencode);