X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_version.c;h=0579467fc1e9cb9a79e5f015582c8dbd1c24e382;hb=ff039e9267166e05d47b16ba4b5f0bf471860843;hp=fbe94118cf53532bc603b52fbe46f160f14a3951;hpb=c8d201fef8f9ad30f1151c96855b3216cf8dd5a7;p=m6w6%2Fext-http

diff --git a/php_http_version.c b/php_http_version.c
index fbe9411..0579467 100644
--- a/php_http_version.c
+++ b/php_http_version.c
@@ -12,7 +12,7 @@
 
 #include "php_http_api.h"
 
-php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major, unsigned minor TSRMLS_DC)
+php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major, unsigned minor)
 {
 	if (!v) {
 		v = emalloc(sizeof(*v));
@@ -24,9 +24,9 @@ php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major,
 	return v;
 }
 
-php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *str TSRMLS_DC)
+php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *str)
 {
-	php_http_version_t tmp;
+	long major, minor;
 	char separator = 0, *stop = NULL;
 	register const char *ptr = str;
 
@@ -40,17 +40,17 @@ php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *st
 		++ptr;
 		/* no break */
 	default:
-		tmp.major = strtol(ptr, &stop, 10);
-		if (stop && stop != ptr && tmp.major != LONG_MIN && tmp.major != LONG_MAX) {
+		major = strtol(ptr, &stop, 10);
+		if (stop && stop != ptr && major != LONG_MIN && major != LONG_MAX) {
 			separator = *stop;
 			if (separator) {
 				if (separator != '.' && separator != ',') {
 					php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Non-standard version separator '%c' in HTTP protocol version '%s'", separator, ptr);
 				}
 				ptr = stop + 1;
-				tmp.minor = strtol(ptr, &stop, 10);
-				if (tmp.minor != LONG_MIN && tmp.minor != LONG_MAX) {
-					return php_http_version_init(v, tmp.major, tmp.minor TSRMLS_CC);
+				minor = strtol(ptr, &stop, 10);
+				if (minor != LONG_MIN && minor != LONG_MAX) {
+					return php_http_version_init(v, major, minor TSRMLS_CC);
 				}
 			}
 		}
@@ -60,7 +60,7 @@ php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *st
 	return NULL;
 }
 
-void php_http_version_to_string(php_http_version_t *v, char **str, size_t *len, const char *pre, const char *post TSRMLS_DC)
+void php_http_version_to_string(php_http_version_t *v, char **str, size_t *len, const char *pre, const char *post)
 {
 	*len = spprintf(str, 0, "%s%u.%u%s", pre ? pre : "", v->major, v->minor, post ? post : "");
 }