ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util/uri.c: remove brackets that wrap `return` statement's content. 

only remove brackets that wrap `return` statements' content.

use `perl -pi -e "s/return \((.*?)\);/return \1;/g" util/uri.c`
to remove pattern like this: "return (1);"

Signed-off-by: Su Hang <suhang16@mails.ucas.ac.cn>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 1519533358-13759-3-git-send-email-suhang16@mails.ucas.ac.cn
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Su Hang 2018-02-25 12:35:57 +08:00 committed by Stefan Hajnoczi
parent be95adaf2b
commit 42fa27253c
1 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
util/uri.c
View File

@ -212,11 +212,11 @@ static int rfc3986_parse_scheme(URI *uri, const char **str)
const char *cur; const char *cur;
if (str == NULL) if (str == NULL)
return (-1); return -1;
cur = *str; cur = *str;
if (!ISA_ALPHA(cur)) if (!ISA_ALPHA(cur))
return (2); return 2;
cur++; cur++;
while (ISA_ALPHA(cur) || ISA_DIGIT(cur) || (*cur == '+') || (*cur == '-') || while (ISA_ALPHA(cur) || ISA_DIGIT(cur) || (*cur == '+') || (*cur == '-') ||
(*cur == '.')) (*cur == '.'))
@ -226,7 +226,7 @@ static int rfc3986_parse_scheme(URI *uri, const char **str)
uri->scheme = g_strndup(*str, cur - *str); uri->scheme = g_strndup(*str, cur - *str);
} }
*str = cur; *str = cur;
return (0); return 0;
} }
/** /**
@ -249,7 +249,7 @@ static int rfc3986_parse_fragment(URI *uri, const char **str)
const char *cur; const char *cur;
if (str == NULL) if (str == NULL)
return (-1); return -1;
cur = *str; cur = *str;
@ -265,7 +265,7 @@ static int rfc3986_parse_fragment(URI *uri, const char **str)
uri->fragment = uri_string_unescape(*str, cur - *str, NULL); uri->fragment = uri_string_unescape(*str, cur - *str, NULL);
} }
*str = cur; *str = cur;
return (0); return 0;
} }
/** /**
@ -284,7 +284,7 @@ static int rfc3986_parse_query(URI *uri, const char **str)
const char *cur; const char *cur;
if (str == NULL) if (str == NULL)
return (-1); return -1;
cur = *str; cur = *str;
@ -296,7 +296,7 @@ static int rfc3986_parse_query(URI *uri, const char **str)
uri->query = g_strndup(*str, cur - *str); uri->query = g_strndup(*str, cur - *str);
} }
*str = cur; *str = cur;
return (0); return 0;
} }
/** /**
@ -362,9 +362,9 @@ static int rfc3986_parse_user_info(URI *uri, const char **str)
uri->user = uri_string_unescape(*str, cur - *str, NULL); uri->user = uri_string_unescape(*str, cur - *str, NULL);
} }
*str = cur; *str = cur;
return (0); return 0;
} }
return (1); return 1;
} }
/** /**
@ -386,7 +386,7 @@ static int rfc3986_parse_dec_octet(const char **str)
const char *cur = *str; const char *cur = *str;
if (!(ISA_DIGIT(cur))) if (!(ISA_DIGIT(cur)))
return (1); return 1;
if (!ISA_DIGIT(cur + 1)) if (!ISA_DIGIT(cur + 1))
cur++; cur++;
else if ((*cur != '0') && (ISA_DIGIT(cur + 1)) && (!ISA_DIGIT(cur + 2))) else if ((*cur != '0') && (ISA_DIGIT(cur + 1)) && (!ISA_DIGIT(cur + 2)))
@ -400,9 +400,9 @@ static int rfc3986_parse_dec_octet(const char **str)
(*(cur + 1) <= '5')) (*(cur + 1) <= '5'))
cur += 3; cur += 3;
else else
return (1); return 1;
*str = cur; *str = cur;
return (0); return 0;
} }
/** /**
* rfc3986_parse_host: * rfc3986_parse_host:
@ -433,7 +433,7 @@ static int rfc3986_parse_host(URI *uri, const char **str)
while ((*cur != ']') && (*cur != 0)) while ((*cur != ']') && (*cur != 0))
cur++; cur++;
if (*cur != ']') if (*cur != ']')
return (1); return 1;
cur++; cur++;
goto found; goto found;
} }
@ -479,7 +479,7 @@ found:
uri->server = NULL; uri->server = NULL;
} }
*str = cur; *str = cur;
return (0); return 0;
} }
/** /**
@ -510,15 +510,15 @@ static int rfc3986_parse_authority(URI *uri, const char **str)
cur++; cur++;
ret = rfc3986_parse_host(uri, &cur); ret = rfc3986_parse_host(uri, &cur);
if (ret != 0) if (ret != 0)
return (ret); return ret;
if (*cur == ':') { if (*cur == ':') {
cur++; cur++;
ret = rfc3986_parse_port(uri, &cur); ret = rfc3986_parse_port(uri, &cur);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} }
*str = cur; *str = cur;
return (0); return 0;
} }
/** /**
@ -544,13 +544,13 @@ static int rfc3986_parse_segment(const char **str, char forbid, int empty)
cur = *str; cur = *str;
if (!ISA_PCHAR(cur)) { if (!ISA_PCHAR(cur)) {
if (empty) if (empty)
return (0); return 0;
return (1); return 1;
} }
while (ISA_PCHAR(cur) && (*cur != forbid)) while (ISA_PCHAR(cur) && (*cur != forbid))
NEXT(cur); NEXT(cur);
*str = cur; *str = cur;
return (0); return 0;
} }
/** /**
@ -576,7 +576,7 @@ static int rfc3986_parse_path_ab_empty(URI *uri, const char **str)
cur++; cur++;
ret = rfc3986_parse_segment(&cur, 0, 1); ret = rfc3986_parse_segment(&cur, 0, 1);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} }
if (uri != NULL) { if (uri != NULL) {
g_free(uri->path); g_free(uri->path);
@ -590,7 +590,7 @@ static int rfc3986_parse_path_ab_empty(URI *uri, const char **str)
} }
} }
*str = cur; *str = cur;
return (0); return 0;
} }
/** /**
@ -613,7 +613,7 @@ static int rfc3986_parse_path_absolute(URI *uri, const char **str)
cur = *str; cur = *str;
if (*cur != '/') if (*cur != '/')
return (1); return 1;
cur++; cur++;
ret = rfc3986_parse_segment(&cur, 0, 0); ret = rfc3986_parse_segment(&cur, 0, 0);
if (ret == 0) { if (ret == 0) {
@ -621,7 +621,7 @@ static int rfc3986_parse_path_absolute(URI *uri, const char **str)
cur++; cur++;
ret = rfc3986_parse_segment(&cur, 0, 1); ret = rfc3986_parse_segment(&cur, 0, 1);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} }
} }
if (uri != NULL) { if (uri != NULL) {
@ -636,7 +636,7 @@ static int rfc3986_parse_path_absolute(URI *uri, const char **str)
} }
} }
*str = cur; *str = cur;
return (0); return 0;
} }
/** /**
@ -660,12 +660,12 @@ static int rfc3986_parse_path_rootless(URI *uri, const char **str)
ret = rfc3986_parse_segment(&cur, 0, 0); ret = rfc3986_parse_segment(&cur, 0, 0);
if (ret != 0) if (ret != 0)
return (ret); return ret;
while (*cur == '/') { while (*cur == '/') {
cur++; cur++;
ret = rfc3986_parse_segment(&cur, 0, 1); ret = rfc3986_parse_segment(&cur, 0, 1);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} }
if (uri != NULL) { if (uri != NULL) {
g_free(uri->path); g_free(uri->path);
@ -679,7 +679,7 @@ static int rfc3986_parse_path_rootless(URI *uri, const char **str)
} }
} }
*str = cur; *str = cur;
return (0); return 0;
} }
/** /**
@ -703,12 +703,12 @@ static int rfc3986_parse_path_no_scheme(URI *uri, const char **str)
ret = rfc3986_parse_segment(&cur, ':', 0); ret = rfc3986_parse_segment(&cur, ':', 0);
if (ret != 0) if (ret != 0)
return (ret); return ret;
while (*cur == '/') { while (*cur == '/') {
cur++; cur++;
ret = rfc3986_parse_segment(&cur, 0, 1); ret = rfc3986_parse_segment(&cur, 0, 1);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} }
if (uri != NULL) { if (uri != NULL) {
g_free(uri->path); g_free(uri->path);
@ -722,7 +722,7 @@ static int rfc3986_parse_path_no_scheme(URI *uri, const char **str)
} }
} }
*str = cur; *str = cur;
return (0); return 0;
} }
/** /**
@ -751,20 +751,20 @@ static int rfc3986_parse_hier_part(URI *uri, const char **str)
cur += 2; cur += 2;
ret = rfc3986_parse_authority(uri, &cur); ret = rfc3986_parse_authority(uri, &cur);
if (ret != 0) if (ret != 0)
return (ret); return ret;
ret = rfc3986_parse_path_ab_empty(uri, &cur); ret = rfc3986_parse_path_ab_empty(uri, &cur);
if (ret != 0) if (ret != 0)
return (ret); return ret;
*str = cur; *str = cur;
return (0); return 0;
} else if (*cur == '/') { } else if (*cur == '/') {
ret = rfc3986_parse_path_absolute(uri, &cur); ret = rfc3986_parse_path_absolute(uri, &cur);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} else if (ISA_PCHAR(cur)) { } else if (ISA_PCHAR(cur)) {
ret = rfc3986_parse_path_rootless(uri, &cur); ret = rfc3986_parse_path_rootless(uri, &cur);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} else { } else {
/* path-empty is effectively empty */ /* path-empty is effectively empty */
if (uri != NULL) { if (uri != NULL) {
@ -773,7 +773,7 @@ static int rfc3986_parse_hier_part(URI *uri, const char **str)
} }
} }
*str = cur; *str = cur;
return (0); return 0;
} }
/** /**
@ -800,18 +800,18 @@ static int rfc3986_parse_relative_ref(URI *uri, const char *str)
str += 2; str += 2;
ret = rfc3986_parse_authority(uri, &str); ret = rfc3986_parse_authority(uri, &str);
if (ret != 0) if (ret != 0)
return (ret); return ret;
ret = rfc3986_parse_path_ab_empty(uri, &str); ret = rfc3986_parse_path_ab_empty(uri, &str);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} else if (*str == '/') { } else if (*str == '/') {
ret = rfc3986_parse_path_absolute(uri, &str); ret = rfc3986_parse_path_absolute(uri, &str);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} else if (ISA_PCHAR(str)) { } else if (ISA_PCHAR(str)) {
ret = rfc3986_parse_path_no_scheme(uri, &str); ret = rfc3986_parse_path_no_scheme(uri, &str);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} else { } else {
/* path-empty is effectively empty */ /* path-empty is effectively empty */
if (uri != NULL) { if (uri != NULL) {
@ -824,19 +824,19 @@ static int rfc3986_parse_relative_ref(URI *uri, const char *str)
str++; str++;
ret = rfc3986_parse_query(uri, &str); ret = rfc3986_parse_query(uri, &str);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} }
if (*str == '#') { if (*str == '#') {
str++; str++;
ret = rfc3986_parse_fragment(uri, &str); ret = rfc3986_parse_fragment(uri, &str);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} }
if (*str != 0) { if (*str != 0) {
uri_clean(uri); uri_clean(uri);
return (1); return 1;
} }
return (0); return 0;
} }
/** /**
@ -857,31 +857,31 @@ static int rfc3986_parse(URI *uri, const char *str)
ret = rfc3986_parse_scheme(uri, &str); ret = rfc3986_parse_scheme(uri, &str);
if (ret != 0) if (ret != 0)
return (ret); return ret;
if (*str != ':') { if (*str != ':') {
return (1); return 1;
} }
str++; str++;
ret = rfc3986_parse_hier_part(uri, &str); ret = rfc3986_parse_hier_part(uri, &str);
if (ret != 0) if (ret != 0)
return (ret); return ret;
if (*str == '?') { if (*str == '?') {
str++; str++;
ret = rfc3986_parse_query(uri, &str); ret = rfc3986_parse_query(uri, &str);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} }
if (*str == '#') { if (*str == '#') {
str++; str++;
ret = rfc3986_parse_fragment(uri, &str); ret = rfc3986_parse_fragment(uri, &str);
if (ret != 0) if (ret != 0)
return (ret); return ret;
} }
if (*str != 0) { if (*str != 0) {
uri_clean(uri); uri_clean(uri);
return (1); return 1;
} }
return (0); return 0;
} }
/** /**
@ -901,7 +901,7 @@ static int rfc3986_parse_uri_reference(URI *uri, const char *str)
int ret; int ret;
if (str == NULL) if (str == NULL)
return (-1); return -1;
uri_clean(uri); uri_clean(uri);
/* /*
@ -914,10 +914,10 @@ static int rfc3986_parse_uri_reference(URI *uri, const char *str)
ret = rfc3986_parse_relative_ref(uri, str); ret = rfc3986_parse_relative_ref(uri, str);
if (ret != 0) { if (ret != 0) {
uri_clean(uri); uri_clean(uri);
return (ret); return ret;
} }
} }
return (0); return 0;
} }
/** /**
@ -936,14 +936,14 @@ URI *uri_parse(const char *str)
int ret; int ret;
if (str == NULL) if (str == NULL)
return (NULL); return NULL;
uri = uri_new(); uri = uri_new();
ret = rfc3986_parse_uri_reference(uri, str); ret = rfc3986_parse_uri_reference(uri, str);
if (ret) { if (ret) {
uri_free(uri); uri_free(uri);
return (NULL); return NULL;
} }
return (uri); return uri;
} }
/** /**
@ -960,7 +960,7 @@ URI *uri_parse(const char *str)
*/ */
int uri_parse_into(URI *uri, const char *str) int uri_parse_into(URI *uri, const char *str)
{ {
return (rfc3986_parse_uri_reference(uri, str)); return rfc3986_parse_uri_reference(uri, str);
} }
/** /**
@ -980,7 +980,7 @@ URI *uri_parse_raw(const char *str, int raw)
int ret; int ret;
if (str == NULL) if (str == NULL)
return (NULL); return NULL;
uri = uri_new(); uri = uri_new();
if (raw) { if (raw) {
uri->cleanup |= 2; uri->cleanup |= 2;
@ -988,9 +988,9 @@ URI *uri_parse_raw(const char *str, int raw)
ret = uri_parse_into(uri, str); ret = uri_parse_into(uri, str);
if (ret) { if (ret) {
uri_free(uri); uri_free(uri);
return (NULL); return NULL;
} }
return (uri); return uri;
} }
/************************************************************************ /************************************************************************
@ -1011,7 +1011,7 @@ URI *uri_new(void)
URI *ret; URI *ret;
ret = g_new0(URI, 1); ret = g_new0(URI, 1);
return (ret); return ret;
} }
/** /**
@ -1028,7 +1028,7 @@ static char *realloc2n(char *ret, int *max)
tmp = *max * 2; tmp = *max * 2;
temp = g_realloc(ret, (tmp + 1)); temp = g_realloc(ret, (tmp + 1));
*max = tmp; *max = tmp;
return (temp); return temp;
} }
/** /**
@ -1048,7 +1048,7 @@ char *uri_to_string(URI *uri)
int max; int max;
if (uri == NULL) if (uri == NULL)
return (NULL); return NULL;
max = 80; max = 80;
ret = g_malloc(max + 1); ret = g_malloc(max + 1);
@ -1249,7 +1249,7 @@ char *uri_to_string(URI *uri)
ret = temp; ret = temp;
} }
ret[len] = 0; ret[len] = 0;
return (ret); return ret;
} }
/** /**
@ -1315,7 +1315,7 @@ static int normalize_uri_path(char *path)
char *cur, *out; char *cur, *out;
if (path == NULL) if (path == NULL)
return (-1); return -1;
/* Skip all initial "/" chars. We want to get to the beginning of the /* Skip all initial "/" chars. We want to get to the beginning of the
* first non-empty segment. * first non-empty segment.
@ -1324,7 +1324,7 @@ static int normalize_uri_path(char *path)
while (cur[0] == '/') while (cur[0] == '/')
++cur; ++cur;
if (cur[0] == '\0') if (cur[0] == '\0')
return (0); return 0;
/* Keep everything we've seen so far. */ /* Keep everything we've seen so far. */
out = cur; out = cur;
@ -1372,7 +1372,7 @@ done_cd:
while (cur[0] == '/') while (cur[0] == '/')
++cur; ++cur;
if (cur[0] == '\0') if (cur[0] == '\0')
return (0); return 0;
/* /*
* Analyze each segment in sequence for cases (e) and (f). * Analyze each segment in sequence for cases (e) and (f).
@ -1485,15 +1485,15 @@ done_cd:
} }
} }
return (0); return 0;
} }
static int is_hex(char c) static int is_hex(char c)
{ {
if (((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) || if (((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) ||
((c >= 'A') && (c <= 'F'))) ((c >= 'A') && (c <= 'F')))
return (1); return 1;
return (0); return 0;
} }
/** /**
@ -1516,11 +1516,11 @@ char *uri_string_unescape(const char *str, int len, char *target)
const char *in; const char *in;
if (str == NULL) if (str == NULL)
return (NULL); return NULL;
if (len <= 0) if (len <= 0)
len = strlen(str); len = strlen(str);
if (len < 0) if (len < 0)
return (NULL); return NULL;
if (target == NULL) { if (target == NULL) {
ret = g_malloc(len + 1); ret = g_malloc(len + 1);
@ -1553,7 +1553,7 @@ char *uri_string_unescape(const char *str, int len, char *target)
} }
} }
*out = 0; *out = 0;
return (ret); return ret;
} }
/** /**
@ -1574,12 +1574,12 @@ char *uri_string_escape(const char *str, const char *list)
int len, out; int len, out;
if (str == NULL) if (str == NULL)
return (NULL); return NULL;
if (str[0] == 0) if (str[0] == 0)
return (g_strdup(str)); return g_strdup(str);
len = strlen(str); len = strlen(str);
if (!(len > 0)) if (!(len > 0))
return (NULL); return NULL;
len += 20; len += 20;
ret = g_malloc(len); ret = g_malloc(len);
@ -1612,7 +1612,7 @@ char *uri_string_escape(const char *str, const char *list)
} }
} }
ret[out] = 0; ret[out] = 0;
return (ret); return ret;
} }
/************************************************************************ /************************************************************************
@ -1851,7 +1851,7 @@ done:
uri_free(bas); uri_free(bas);
if (res != NULL) if (res != NULL)
uri_free(res); uri_free(res);
return (val); return val;
} }
/** /**