[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/46] util/uri: uri_new() can't fail, drop dead erro
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 26/46] util/uri: uri_new() can't fail, drop dead error handling |
Date: |
Tue, 10 Feb 2015 09:34:15 +0300 |
From: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
util/uri.c | 36 +++++++++++-------------------------
1 file changed, 11 insertions(+), 25 deletions(-)
diff --git a/util/uri.c b/util/uri.c
index 918d235..aa39694 100644
--- a/util/uri.c
+++ b/util/uri.c
@@ -928,12 +928,10 @@ uri_parse(const char *str) {
if (str == NULL)
return(NULL);
uri = uri_new();
- if (uri != NULL) {
- ret = rfc3986_parse_uri_reference(uri, str);
- if (ret) {
- uri_free(uri);
- return(NULL);
- }
+ ret = rfc3986_parse_uri_reference(uri, str);
+ if (ret) {
+ uri_free(uri);
+ return(NULL);
}
return(uri);
}
@@ -974,15 +972,13 @@ uri_parse_raw(const char *str, int raw) {
if (str == NULL)
return(NULL);
uri = uri_new();
- if (uri != NULL) {
- if (raw) {
- uri->cleanup |= 2;
- }
- ret = uri_parse_into(uri, str);
- if (ret) {
- uri_free(uri);
- return(NULL);
- }
+ if (raw) {
+ uri->cleanup |= 2;
+ }
+ ret = uri_parse_into(uri, str);
+ if (ret) {
+ uri_free(uri);
+ return(NULL);
}
return(uri);
}
@@ -1675,8 +1671,6 @@ uri_resolve(const char *uri, const char *base) {
else {
if (*uri) {
ref = uri_new();
- if (ref == NULL)
- goto done;
ret = uri_parse_into(ref, uri);
}
else
@@ -1695,8 +1689,6 @@ uri_resolve(const char *uri, const char *base) {
ret = -1;
else {
bas = uri_new();
- if (bas == NULL)
- goto done;
ret = uri_parse_into(bas, base);
}
if (ret != 0) {
@@ -1727,8 +1719,6 @@ uri_resolve(const char *uri, const char *base) {
* document.
*/
res = uri_new();
- if (res == NULL)
- goto done;
if ((ref->scheme == NULL) && (ref->path == NULL) &&
((ref->authority == NULL) && (ref->server == NULL))) {
res->scheme = g_strdup(bas->scheme);
@@ -1933,8 +1923,6 @@ uri_resolve_relative (const char *uri, const char * base)
* First parse URI into a standard form
*/
ref = uri_new ();
- if (ref == NULL)
- return NULL;
/* If URI not already in "relative" form */
if (uri[0] != '.') {
ret = uri_parse_into (ref, uri);
@@ -1951,8 +1939,6 @@ uri_resolve_relative (const char *uri, const char * base)
goto done;
}
bas = uri_new ();
- if (bas == NULL)
- goto done;
if (base[0] != '.') {
ret = uri_parse_into (bas, base);
if (ret != 0)
--
2.1.4
- [Qemu-devel] [PULL 04/46] Add trace to ps2.c., (continued)
- [Qemu-devel] [PULL 04/46] Add trace to ps2.c., Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 12/46] linux-user/syscall.c: do_ioctl_dm: Need to call unlock_user() before going to failure return in default case, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 34/46] rdma: g_malloc0() can't fail, bury dead error handling, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 36/46] translate-all: Use g_try_malloc() for dynamic translator buffer, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 37/46] disas/cris: Fix warning caused by missing 'static' attribute, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 02/46] fw_cfg: fix typos in comments: patch -> path, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 41/46] moxie: Fix warning caused by missing include statement, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 01/46] target-mips: Clean up switch fall through after commit fecd264, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 06/46] Convert some debugging printfs to trace calls in pcnet.c., Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 07/46] vl: Fix bogus error message for implied mon ID clashing, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 26/46] util/uri: uri_new() can't fail, drop dead error handling,
Michael Tokarev <=
- [Qemu-devel] [PULL 38/46] disas/sh4: Fix warning caused by missing 'static' attribute, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 29/46] QJSON: fix typo in author's email address, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 42/46] serial: Fix warnings caused by missing 'static' attribute, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 45/46] vga: Fix warning caused by missing 'static' attribute, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 11/46] linux-user/main.c: Use TARGET_SIG* instead of SIG*, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 25/46] usb: Pair g_malloc() with g_free(), not free(), Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 10/46] linux-user/syscall.c: Fix typo issue for using target_vec[i].iov_len instead of target_vec[i].iov_base, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 18/46] vl.c: fix memory leak spotted by valgrind, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 09/46] linux-user/syscall.c: lock_iovec: unlock vec[i] in failure processing code block, Michael Tokarev, 2015/02/10
- [Qemu-devel] [PULL 43/46] spice: Add missing 'static' attribute, Michael Tokarev, 2015/02/10