Skip to content

Commit 36ae074

Browse files
khanrnnikic
authored andcommitted
Simplify mb_gpc() code
Use a switch (consistent with other places in this file) and also don't unnecessarily set free_buffer.
1 parent 251bd9c commit 36ae074

File tree

1 file changed

+21
-23
lines changed

1 file changed

+21
-23
lines changed

ext/mbstring/mb_gpc.c

+21-23
Original file line numberDiff line numberDiff line change
@@ -90,30 +90,28 @@ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data)
9090
break;
9191
}
9292

93-
if (arg == PARSE_POST) {
94-
sapi_handle_post(&v_array);
95-
return;
96-
}
97-
98-
if (arg == PARSE_GET) { /* GET data */
99-
c_var = SG(request_info).query_string;
100-
if (c_var && *c_var) {
101-
res = (char *) estrdup(c_var);
102-
free_buffer = 1;
103-
} else {
104-
free_buffer = 0;
105-
}
106-
} else if (arg == PARSE_COOKIE) { /* Cookie data */
107-
c_var = SG(request_info).cookie_data;
108-
if (c_var && *c_var) {
109-
res = (char *) estrdup(c_var);
93+
switch (arg) {
94+
case PARSE_POST:
95+
sapi_handle_post(&v_array);
96+
return;
97+
case PARSE_GET: /* GET data */
98+
c_var = SG(request_info).query_string;
99+
if (c_var && *c_var) {
100+
res = (char *) estrdup(c_var);
101+
free_buffer = 1;
102+
}
103+
break;
104+
case PARSE_COOKIE: /* Cookie data */
105+
c_var = SG(request_info).cookie_data;
106+
if (c_var && *c_var) {
107+
res = (char *) estrdup(c_var);
108+
free_buffer = 1;
109+
}
110+
break;
111+
case PARSE_STRING: /* String data */
112+
res = str;
110113
free_buffer = 1;
111-
} else {
112-
free_buffer = 0;
113-
}
114-
} else if (arg == PARSE_STRING) { /* String data */
115-
res = str;
116-
free_buffer = 1;
114+
break;
117115
}
118116

119117
if (!res) {

0 commit comments

Comments
 (0)