The following changes since commit 136c67e07869227b21b3f627316e03679ce7b738:

Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-2018-03-02' into staging (2018-03-02 16:56:20 +0000)

git://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 23500c6a9409efc80d696aede0629bfbe7556a90:

README: Document 'git-publish' workflow (2018-03-05 09:03:17 +0000)

Pull request

Mostly patches that are only indirectly related to the block layer, but I've

reviewed them and there is no maintainer.

Fam Zheng (2):

Add a git-publish configuration file

README: Document 'git-publish' workflow

Su Hang (3):

util/uri.c: Coding style check, Only whitespace involved

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

util/uri.c: wrap single statement blocks with braces {}

Thomas Huth (1):

tests/libqos: Check for valid dev pointer when looking for PCI devices

tests/libqos/virtio-pci.c | 4 +-

util/uri.c | 1733 ++++++++++++++++++++++++---------------------

.gitpublish | 51 ++

README | 31 +-

4 files changed, 1014 insertions(+), 805 deletions(-)

create mode 100644 .gitpublish

2.14.3

From: Fam Zheng <famz@redhat.com>

git-publish [1] is a convenient tool to send patches and has been

popular among QEMU developers. Recently it has been made available in

Fedora/Debian official repo.

One nice feature of the tool is a per-project configuration with

profiles, especially in which the cccmd option is a handy method to

create the Cc list.

[1]: https://github.com/stefanha/git-publish

Signed-off-by: Fam Zheng <famz@redhat.com>

Message-id: 20180226030326.20219-2-famz@redhat.com

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

---

.gitpublish | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++

1 file changed, 51 insertions(+)

create mode 100644 .gitpublish

diff --git a/.gitpublish b/.gitpublish

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/.gitpublish

@@ -XXX,XX +XXX,XX @@

+#

+# Common git-publish profiles that can be used to send patches to QEMU upstream.

+#

+# See https://github.com/stefanha/git-publish for more information

+#

+[gitpublishprofile "default"]

+base = master

+to = qemu-devel@nongnu.org

+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null

+[gitpublishprofile "rfc"]

+base = master

+prefix = RFC PATCH

+to = qemu-devel@nongnu.org

+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null

+[gitpublishprofile "stable"]

+base = master

+to = qemu-devel@nongnu.org

+cc = qemu-stable@nongnu.org

+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null

+[gitpublishprofile "trivial"]

+base = master

+to = qemu-devel@nongnu.org

+cc = qemu-trivial@nongnu.org

+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null

+[gitpublishprofile "block"]

+base = master

+to = qemu-devel@nongnu.org

+cc = qemu-block@nongnu.org

+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null

+

+[gitpublishprofile "arm"]

+base = master

+to = qemu-devel@nongnu.org

+cc = qemu-arm@nongnu.org

+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null

+

+[gitpublishprofile "s390"]

+base = master

+to = qemu-devel@nongnu.org

+cc = qemu-s390@nongnu.org

+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null

+

+[gitpublishprofile "ppc"]

+base = master

+to = qemu-devel@nongnu.org

+cc = qemu-ppc@nongnu.org

+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null

2.14.3

From: Thomas Huth <thuth@redhat.com>

dev could be NULL if the PCI device can not be found due to some

reasons, so we must not dereference the pointer in this case.

Signed-off-by: Thomas Huth <thuth@redhat.com>

Message-id: 1519713884-2346-1-git-send-email-thuth@redhat.com

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

tests/libqos/virtio-pci.c | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c

--- a/tests/libqos/virtio-pci.c

+++ b/tests/libqos/virtio-pci.c

@@ -XXX,XX +XXX,XX @@ QVirtioPCIDevice *qvirtio_pci_device_find(QPCIBus *bus, uint16_t device_type)

qvirtio_pci_foreach(bus, device_type, false, 0,

qvirtio_pci_assign_device, &dev);

- dev->vdev.bus = &qvirtio_pci;

+ if (dev) {

+ dev->vdev.bus = &qvirtio_pci;

+ }

return dev;

}

2.14.3

From: Su Hang <suhang16@mails.ucas.ac.cn>

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>

util/uri.c | 160 ++++++++++++++++++++++++++++++-------------------------------

1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/util/uri.c b/util/uri.c

--- a/util/uri.c

+++ b/util/uri.c

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_scheme(URI *uri, const char **str)

const char *cur;

if (str == NULL)

- return (-1);

+ return -1;

cur = *str;

if (!ISA_ALPHA(cur))

- return (2);

+ return 2;

cur++;

while (ISA_ALPHA(cur) || ISA_DIGIT(cur) || (*cur == '+') || (*cur == '-') ||

(*cur == '.'))

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_scheme(URI *uri, const char **str)

uri->scheme = g_strndup(*str, cur - *str);

*str = cur;

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_fragment(URI *uri, const char **str)

const char *cur;

if (str == NULL)

- return (-1);

+ return -1;

cur = *str;

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_fragment(URI *uri, const char **str)

uri->fragment = uri_string_unescape(*str, cur - *str, NULL);

}

*str = cur;

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_query(URI *uri, const char **str)

const char *cur;

if (str == NULL)

- return (-1);

+ return -1;

cur = *str;

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_query(URI *uri, const char **str)

uri->query = g_strndup(*str, cur - *str);

}

*str = cur;

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_user_info(URI *uri, const char **str)

uri->user = uri_string_unescape(*str, cur - *str, NULL);

}

*str = cur;

- return (0);

+ return 0;

}

- return (1);

+ return 1;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_dec_octet(const char **str)

const char *cur = *str;

if (!(ISA_DIGIT(cur)))

- return (1);

+ return 1;

if (!ISA_DIGIT(cur + 1))

cur++;

else if ((*cur != '0') && (ISA_DIGIT(cur + 1)) && (!ISA_DIGIT(cur + 2)))

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_dec_octet(const char **str)

(*(cur + 1) <= '5'))

cur += 3;

else

- return (1);

+ return 1;

*str = cur;

- return (0);

+ return 0;

}

/**

* rfc3986_parse_host:

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_host(URI *uri, const char **str)

while ((*cur != ']') && (*cur != 0))

cur++;

if (*cur != ']')

- return (1);

+ return 1;

cur++;

goto found;

}

@@ -XXX,XX +XXX,XX @@ found:

uri->server = NULL;

}

*str = cur;

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_authority(URI *uri, const char **str)

cur++;

ret = rfc3986_parse_host(uri, &cur);

if (ret != 0)

- return (ret);

+ return ret;

if (*cur == ':') {

cur++;

ret = rfc3986_parse_port(uri, &cur);

if (ret != 0)

- return (ret);

+ return ret;

}

*str = cur;

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_segment(const char **str, char forbid, int empty)

cur = *str;

if (!ISA_PCHAR(cur)) {

if (empty)

- return (0);

- return (1);

+ return 0;

+ return 1;

}

while (ISA_PCHAR(cur) && (*cur != forbid))

NEXT(cur);

*str = cur;

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_ab_empty(URI *uri, const char **str)

cur++;

ret = rfc3986_parse_segment(&cur, 0, 1);

if (ret != 0)

- return (ret);

+ return ret;

}

if (uri != NULL) {

g_free(uri->path);

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_ab_empty(URI *uri, const char **str)

}

}

*str = cur;

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_absolute(URI *uri, const char **str)

cur = *str;

if (*cur != '/')

- return (1);

+ return 1;

cur++;

ret = rfc3986_parse_segment(&cur, 0, 0);

if (ret == 0) {

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_absolute(URI *uri, const char **str)

cur++;

ret = rfc3986_parse_segment(&cur, 0, 1);

if (ret != 0)

- return (ret);

+ return ret;

}

}

if (uri != NULL) {

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_absolute(URI *uri, const char **str)

}

}

*str = cur;

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_rootless(URI *uri, const char **str)

ret = rfc3986_parse_segment(&cur, 0, 0);

if (ret != 0)

- return (ret);

+ return ret;

while (*cur == '/') {

cur++;

ret = rfc3986_parse_segment(&cur, 0, 1);

if (ret != 0)

- return (ret);

+ return ret;

}

if (uri != NULL) {

g_free(uri->path);

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_rootless(URI *uri, const char **str)

}

}

*str = cur;

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_no_scheme(URI *uri, const char **str)

ret = rfc3986_parse_segment(&cur, ':', 0);

if (ret != 0)

- return (ret);

+ return ret;

while (*cur == '/') {

cur++;

ret = rfc3986_parse_segment(&cur, 0, 1);

if (ret != 0)

- return (ret);

+ return ret;

}

if (uri != NULL) {

g_free(uri->path);

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_no_scheme(URI *uri, const char **str)

}

}

*str = cur;

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_hier_part(URI *uri, const char **str)

cur += 2;

ret = rfc3986_parse_authority(uri, &cur);

if (ret != 0)

- return (ret);

+ return ret;

ret = rfc3986_parse_path_ab_empty(uri, &cur);

if (ret != 0)

- return (ret);

+ return ret;

*str = cur;

- return (0);

+ return 0;

} else if (*cur == '/') {

ret = rfc3986_parse_path_absolute(uri, &cur);

if (ret != 0)

- return (ret);

+ return ret;

} else if (ISA_PCHAR(cur)) {

ret = rfc3986_parse_path_rootless(uri, &cur);

if (ret != 0)

- return (ret);

+ return ret;

} else {

/* path-empty is effectively empty */

if (uri != NULL) {

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_hier_part(URI *uri, const char **str)

}

}

*str = cur;

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_relative_ref(URI *uri, const char *str)

str += 2;

ret = rfc3986_parse_authority(uri, &str);

if (ret != 0)

- return (ret);

+ return ret;

ret = rfc3986_parse_path_ab_empty(uri, &str);

if (ret != 0)

- return (ret);

+ return ret;

} else if (*str == '/') {

ret = rfc3986_parse_path_absolute(uri, &str);

if (ret != 0)

- return (ret);

+ return ret;

} else if (ISA_PCHAR(str)) {

ret = rfc3986_parse_path_no_scheme(uri, &str);

if (ret != 0)

- return (ret);

+ return ret;

} else {

/* path-empty is effectively empty */

if (uri != NULL) {

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_relative_ref(URI *uri, const char *str)

str++;

ret = rfc3986_parse_query(uri, &str);

if (ret != 0)

- return (ret);

+ return ret;

}

if (*str == '#') {

str++;

ret = rfc3986_parse_fragment(uri, &str);

if (ret != 0)

- return (ret);

+ return ret;

}

if (*str != 0) {

uri_clean(uri);

- return (1);

+ return 1;

}

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse(URI *uri, const char *str)

ret = rfc3986_parse_scheme(uri, &str);

if (ret != 0)

- return (ret);

+ return ret;

if (*str != ':') {

- return (1);

+ return 1;

}

str++;

ret = rfc3986_parse_hier_part(uri, &str);

if (ret != 0)

- return (ret);

+ return ret;

if (*str == '?') {

str++;

ret = rfc3986_parse_query(uri, &str);

if (ret != 0)

- return (ret);

+ return ret;

}

if (*str == '#') {

str++;

ret = rfc3986_parse_fragment(uri, &str);

if (ret != 0)

- return (ret);

+ return ret;

}

if (*str != 0) {

uri_clean(uri);

- return (1);

+ return 1;

}

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_uri_reference(URI *uri, const char *str)

int ret;

if (str == NULL)

- return (-1);

+ return -1;

uri_clean(uri);

/*

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_uri_reference(URI *uri, const char *str)

ret = rfc3986_parse_relative_ref(uri, str);

if (ret != 0) {

uri_clean(uri);

- return (ret);

+ return ret;

}

}

- return (0);

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ URI *uri_parse(const char *str)

int ret;

if (str == NULL)

- return (NULL);

+ return NULL;

uri = uri_new();

ret = rfc3986_parse_uri_reference(uri, str);

if (ret) {

uri_free(uri);

- return (NULL);

+ return NULL;

}

- return (uri);

+ return uri;

}

/**

@@ -XXX,XX +XXX,XX @@ URI *uri_parse(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);

}

/**

@@ -XXX,XX +XXX,XX @@ URI *uri_parse_raw(const char *str, int raw)

int ret;

if (str == NULL)

- return (NULL);

+ return NULL;

uri = uri_new();

if (raw) {

uri->cleanup |= 2;

@@ -XXX,XX +XXX,XX @@ URI *uri_parse_raw(const char *str, int raw)

ret = uri_parse_into(uri, str);

if (ret) {

uri_free(uri);

- return (NULL);

+ return NULL;

}

- return (uri);

+ return uri;

}

/************************************************************************

@@ -XXX,XX +XXX,XX @@ URI *uri_new(void)

URI *ret;

ret = g_new0(URI, 1);

- return (ret);

+ return ret;

}

/**

@@ -XXX,XX +XXX,XX @@ static char *realloc2n(char *ret, int *max)

tmp = *max * 2;

temp = g_realloc(ret, (tmp + 1));

*max = tmp;

- return (temp);

+ return temp;

}

/**

@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)

int max;

if (uri == NULL)

- return (NULL);

+ return NULL;

max = 80;

ret = g_malloc(max + 1);

@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)

ret = temp;

}

ret[len] = 0;

- return (ret);

+ return ret;

}

/**

@@ -XXX,XX +XXX,XX @@ static int normalize_uri_path(char *path)

char *cur, *out;

if (path == NULL)

- return (-1);

+ return -1;

/* Skip all initial "/" chars. We want to get to the beginning of the

* first non-empty segment.

@@ -XXX,XX +XXX,XX @@ static int normalize_uri_path(char *path)

while (cur[0] == '/')

++cur;

if (cur[0] == '\0')

- return (0);

+ return 0;

/* Keep everything we've seen so far. */

out = cur;

@@ -XXX,XX +XXX,XX @@ done_cd:

while (cur[0] == '/')

++cur;

if (cur[0] == '\0')

- return (0);

+ return 0;

/*

* Analyze each segment in sequence for cases (e) and (f).

@@ -XXX,XX +XXX,XX @@ done_cd:

}

}

- return (0);

+ return 0;

}

static int is_hex(char c)

{

if (((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) ||

((c >= 'A') && (c <= 'F')))

- return (1);

- return (0);

+ return 1;

+ return 0;

}

/**

@@ -XXX,XX +XXX,XX @@ char *uri_string_unescape(const char *str, int len, char *target)

const char *in;

if (str == NULL)

- return (NULL);

+ return NULL;

if (len <= 0)

len = strlen(str);

if (len < 0)

- return (NULL);

+ return NULL;

if (target == NULL) {

ret = g_malloc(len + 1);

@@ -XXX,XX +XXX,XX @@ char *uri_string_unescape(const char *str, int len, char *target)

}

}

*out = 0;

- return (ret);

+ return ret;

}

/**

@@ -XXX,XX +XXX,XX @@ char *uri_string_escape(const char *str, const char *list)

int len, out;

if (str == NULL)

- return (NULL);

+ return NULL;

if (str[0] == 0)

- return (g_strdup(str));

+ return g_strdup(str);

len = strlen(str);

if (!(len > 0))

- return (NULL);

+ return NULL;

len += 20;

ret = g_malloc(len);

@@ -XXX,XX +XXX,XX @@ char *uri_string_escape(const char *str, const char *list)

}

}

ret[out] = 0;

- return (ret);

+ return ret;

}

/************************************************************************

@@ -XXX,XX +XXX,XX @@ done:

uri_free(bas);

if (res != NULL)

uri_free(res);

- return (val);

+ return val;

}

/**

2.14.3

From: Su Hang <suhang16@mails.ucas.ac.cn>

For this patch, using curly braces to wrap `if` `while` `else` statements,

which only hold single statement. For example:

'''

if (cond)

statement;

'''

to

'''

if (cond) {

statement;

}

'''

And using tricks that compare the disassemblies before and after

code changes, to make sure code logic isn't changed:

'''

git checkout master

make util/uri.o

strip util/uri.o

objdump -Drx util/uri.o > /tmp/uri-master.txt

git checkout cleanupbranch

make util/uri.o

strip util/uri.o

objdump -Drx util/uri.o > /tmp/uri-cleanup.txt

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

util/uri.c | 463 +++++++++++++++++++++++++++++++++++++++----------------------

1 file changed, 294 insertions(+), 169 deletions(-)

diff --git a/util/uri.c b/util/uri.c

--- a/util/uri.c

+++ b/util/uri.c

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_scheme(URI *uri, const char **str)

{

const char *cur;

- if (str == NULL)

+ if (str == NULL) {

return -1;

+ }

cur = *str;

- if (!ISA_ALPHA(cur))

+ if (!ISA_ALPHA(cur)) {

return 2;

+ }

cur++;

while (ISA_ALPHA(cur) || ISA_DIGIT(cur) || (*cur == '+') || (*cur == '-') ||

- (*cur == '.'))

+ (*cur == '.')) {

cur++;

+ }

if (uri != NULL) {

g_free(uri->scheme);

uri->scheme = g_strndup(*str, cur - *str);

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_fragment(URI *uri, const char **str)

{

const char *cur;

- if (str == NULL)

+ if (str == NULL) {

return -1;

+ }

cur = *str;

while ((ISA_PCHAR(cur)) || (*cur == '/') || (*cur == '?') ||

(*cur == '[') || (*cur == ']') ||

- ((uri != NULL) && (uri->cleanup & 1) && (IS_UNWISE(cur))))

+ ((uri != NULL) && (uri->cleanup & 1) && (IS_UNWISE(cur)))) {

NEXT(cur);

+ }

if (uri != NULL) {

g_free(uri->fragment);

- if (uri->cleanup & 2)

+ if (uri->cleanup & 2) {

uri->fragment = g_strndup(*str, cur - *str);

- else

uri->fragment = uri_string_unescape(*str, cur - *str, NULL);

*str = cur;

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_query(URI *uri, const char **str)

{

const char *cur;

- if (str == NULL)

+ if (str == NULL) {

return -1;

+ }

cur = *str;

while ((ISA_PCHAR(cur)) || (*cur == '/') || (*cur == '?') ||

- ((uri != NULL) && (uri->cleanup & 1) && (IS_UNWISE(cur))))

+ ((uri != NULL) && (uri->cleanup & 1) && (IS_UNWISE(cur)))) {

NEXT(cur);

+ }

if (uri != NULL) {

g_free(uri->query);

uri->query = g_strndup(*str, cur - *str);

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_user_info(URI *uri, const char **str)

cur = *str;

while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cur) ||

- (*cur == ':'))

+ (*cur == ':')) {

NEXT(cur);

+ }

if (*cur == '@') {

if (uri != NULL) {

g_free(uri->user);

- if (uri->cleanup & 2)

+ if (uri->cleanup & 2) {

uri->user = g_strndup(*str, cur - *str);

- else

+ } else {

uri->user = uri_string_unescape(*str, cur - *str, NULL);

+ }

}

*str = cur;

return 0;

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_dec_octet(const char **str)

{

const char *cur = *str;

- if (!(ISA_DIGIT(cur)))

+ if (!(ISA_DIGIT(cur))) {

return 1;

- if (!ISA_DIGIT(cur + 1))

+ }

+ if (!ISA_DIGIT(cur + 1)) {

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))) {

cur += 2;

- else if ((*cur == '1') && (ISA_DIGIT(cur + 1)) && (ISA_DIGIT(cur + 2)))

+ } else if ((*cur == '1') && (ISA_DIGIT(cur + 1)) && (ISA_DIGIT(cur + 2))) {

cur += 3;

- else if ((*cur == '2') && (*(cur + 1) >= '0') && (*(cur + 1) <= '4') &&

- (ISA_DIGIT(cur + 2)))

+ } else if ((*cur == '2') && (*(cur + 1) >= '0') && (*(cur + 1) <= '4') &&

+ (ISA_DIGIT(cur + 2))) {

cur += 3;

- else if ((*cur == '2') && (*(cur + 1) == '5') && (*(cur + 2) >= '0') &&

- (*(cur + 1) <= '5'))

+ } else if ((*cur == '2') && (*(cur + 1) == '5') && (*(cur + 2) >= '0') &&

+ (*(cur + 1) <= '5')) {

cur += 3;

- else

+ } else {

return 1;

+ }

*str = cur;

return 0;

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_host(URI *uri, const char **str)

*/

if (*cur == '[') {

cur++;

- while ((*cur != ']') && (*cur != 0))

+ while ((*cur != ']') && (*cur != 0)) {

cur++;

- if (*cur != ']')

+ }

+ if (*cur != ']') {

return 1;

+ }

cur++;

goto found;

}

@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_host(URI *uri, const char **str)

* try to parse an IPv4