Series comparison

-[Qemu-devel] [PULL 0/6] Block patches
+[PULL 0/8] Block patches
-The following changes since commit 136c67e07869227b21b3f627316e03679ce7b738:
+The following changes since commit 6c769690ac845fa62642a5f93b4e4bd906adab95:
-  Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-2018-03-02' into staging (2018-03-02 16:56:20 +0000)
+  Merge remote-tracking branch 'remotes/vsementsov/tags/pull-simplebench-2021-05-04' into staging (2021-05-21 12:02:34 +0100)
 are available in the Git repository at:
-  git://github.com/stefanha/qemu.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 23500c6a9409efc80d696aede0629bfbe7556a90:
+for you to fetch changes up to 0a6f0c76a030710780ce10d6347a70f098024d21:
-  README: Document 'git-publish' workflow (2018-03-05 09:03:17 +0000)
+  coroutine-sleep: introduce qemu_co_sleep (2021-05-21 18:22:33 +0100)
 ----------------------------------------------------------------
 Pull request
-Mostly patches that are only indirectly related to the block layer, but I've
+(Resent due to an email preparation mistake.)
 reviewed them and there is no maintainer.
 ----------------------------------------------------------------
-Fam Zheng (2):
+Paolo Bonzini (6):
-  Add a git-publish configuration file
+  coroutine-sleep: use a stack-allocated timer
-  README: Document 'git-publish' workflow
+  coroutine-sleep: disallow NULL QemuCoSleepState** argument
   coroutine-sleep: allow qemu_co_sleep_wake that wakes nothing
   coroutine-sleep: move timer out of QemuCoSleepState
   coroutine-sleep: replace QemuCoSleepState pointer with struct in the
     API
   coroutine-sleep: introduce qemu_co_sleep
-Su Hang (3):
+Philippe Mathieu-Daudé (1):
-  util/uri.c: Coding style check, Only whitespace involved
+  bitops.h: Improve find_xxx_bit() documentation
   util/uri.c: remove brackets that wrap `return` statement's content.
   util/uri.c: wrap single statement blocks with braces {}
-Thomas Huth (1):
+Zenghui Yu (1):
-  tests/libqos: Check for valid dev pointer when looking for PCI devices
+  multi-process: Initialize variables declared with g_auto*
- tests/libqos/virtio-pci.c |    4 +-
+ include/qemu/bitops.h       | 15 ++++++--
- util/uri.c                | 1733 ++++++++++++++++++++++++---------------------
+ include/qemu/coroutine.h    | 27 ++++++++-----
- .gitpublish               |   51 ++
+ block/block-copy.c          | 10 ++---
- README                    |   31 +-
+ block/nbd.c                 | 14 +++----
-files changed, 1014 insertions(+), 805 deletions(-)
+ hw/remote/memory.c          |  5 +--
- create mode 100644 .gitpublish
+ hw/remote/proxy.c           |  3 +-
  util/qemu-coroutine-sleep.c | 75 +++++++++++++++++++------------------
 files changed, 79 insertions(+), 70 deletions(-)
 --
-.14.3
+.31.1

-New patch
+[PULL 1/8] multi-process: Initialize variables declared with g_auto*
+From: Zenghui Yu <yuzenghui@huawei.com>
+Quote docs/devel/style.rst (section "Automatic memory deallocation"):
+* Variables declared with g_auto* MUST always be initialized,
+  otherwise the cleanup function will use uninitialized stack memory
+Initialize @name properly to get rid of the compilation error (using
+gcc-7.3.0 on CentOS):
+../hw/remote/proxy.c: In function 'pci_proxy_dev_realize':
+/usr/include/glib-2.0/glib/glib-autocleanups.h:28:3: error: 'name' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+   g_free (*pp);
+   ^~~~~~~~~~~~
+../hw/remote/proxy.c:350:30: note: 'name' was declared here
+             g_autofree char *name;
+                              ^~~~
+Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
+Reviewed-by: Jagannathan Raman <jag.raman@oracle.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com>
+Message-id: 20210312112143.1369-1-yuzenghui@huawei.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ hw/remote/memory.c | 5 ++---
+ hw/remote/proxy.c  | 3 +--
+files changed, 3 insertions(+), 5 deletions(-)
+diff --git a/hw/remote/memory.c b/hw/remote/memory.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/remote/memory.c
++++ b/hw/remote/memory.c
+@@ -XXX,XX +XXX,XX @@ void remote_sysmem_reconfig(MPQemuMsg *msg, Error **errp)
+     remote_sysmem_reset();
+-    for (region = 0; region < msg->num_fds; region++) {
+-        g_autofree char *name;
++    for (region = 0; region < msg->num_fds; region++, suffix++) {
++        g_autofree char *name = g_strdup_printf("remote-mem-%u", suffix);
+         subregion = g_new(MemoryRegion, 1);
+-        name = g_strdup_printf("remote-mem-%u", suffix++);
+         memory_region_init_ram_from_fd(subregion, NULL,
+                                        name, sysmem_info->sizes[region],
+                                        true, msg->fds[region],
+diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/remote/proxy.c
++++ b/hw/remote/proxy.c
+@@ -XXX,XX +XXX,XX @@ static void probe_pci_info(PCIDevice *dev, Error **errp)
+                    PCI_BASE_ADDRESS_SPACE_IO : PCI_BASE_ADDRESS_SPACE_MEMORY;
+         if (size) {
+-            g_autofree char *name;
++            g_autofree char *name = g_strdup_printf("bar-region-%d", i);
+             pdev->region[i].dev = pdev;
+             pdev->region[i].present = true;
+             if (type == PCI_BASE_ADDRESS_SPACE_MEMORY) {
+                 pdev->region[i].memory = true;
+             }
+-            name = g_strdup_printf("bar-region-%d", i);
+             memory_region_init_io(&pdev->region[i].mr, OBJECT(pdev),
+                                   &proxy_mr_ops, &pdev->region[i],
+                                   name, size);
+--
+.31.1

-New patch
+[PULL 2/8] bitops.h: Improve find_xxx_bit() documentation
+From: Philippe Mathieu-Daudé <philmd@redhat.com>
+Document the following functions return the bitmap size
+if no matching bit is found:
+- find_first_bit
+- find_next_bit
+- find_last_bit
+- find_first_zero_bit
+- find_next_zero_bit
+Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
+Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: 20210510200758.2623154-2-philmd@redhat.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ include/qemu/bitops.h | 15 ++++++++++++---
+file changed, 12 insertions(+), 3 deletions(-)
+diff --git a/include/qemu/bitops.h b/include/qemu/bitops.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/qemu/bitops.h
++++ b/include/qemu/bitops.h
+@@ -XXX,XX +XXX,XX @@ static inline int test_bit(long nr, const unsigned long *addr)
+  * @addr: The address to start the search at
+  * @size: The maximum size to search
+  *
+- * Returns the bit number of the first set bit, or size.
++ * Returns the bit number of the last set bit,
++ * or @size if there is no set bit in the bitmap.
+  */
+ unsigned long find_last_bit(const unsigned long *addr,
+                             unsigned long size);
+@@ -XXX,XX +XXX,XX @@ unsigned long find_last_bit(const unsigned long *addr,
+  * @addr: The address to base the search on
+  * @offset: The bitnumber to start searching at
+  * @size: The bitmap size in bits
++ *
++ * Returns the bit number of the next set bit,
++ * or @size if there are no further set bits in the bitmap.
+  */
+ unsigned long find_next_bit(const unsigned long *addr,
+                             unsigned long size,
+@@ -XXX,XX +XXX,XX @@ unsigned long find_next_bit(const unsigned long *addr,
+  * @addr: The address to base the search on
+  * @offset: The bitnumber to start searching at
+  * @size: The bitmap size in bits
++ *
++ * Returns the bit number of the next cleared bit,
++ * or @size if there are no further clear bits in the bitmap.
+  */
+ unsigned long find_next_zero_bit(const unsigned long *addr,
+@@ -XXX,XX +XXX,XX @@ unsigned long find_next_zero_bit(const unsigned long *addr,
+  * @addr: The address to start the search at
+  * @size: The maximum size to search
+  *
+- * Returns the bit number of the first set bit.
++ * Returns the bit number of the first set bit,
++ * or @size if there is no set bit in the bitmap.
+  */
+ static inline unsigned long find_first_bit(const unsigned long *addr,
+                                            unsigned long size)
+@@ -XXX,XX +XXX,XX @@ static inline unsigned long find_first_bit(const unsigned long *addr,
+  * @addr: The address to start the search at
+  * @size: The maximum size to search
+  *
+- * Returns the bit number of the first cleared bit.
++ * Returns the bit number of the first cleared bit,
++ * or @size if there is no clear bit in the bitmap.
+  */
+ static inline unsigned long find_first_zero_bit(const unsigned long *addr,
+                                                 unsigned long size)
+--
+.31.1

-[Qemu-devel] [PULL 6/6] README: Document 'git-publish' workflow
+[PULL 3/8] coroutine-sleep: use a stack-allocated timer
-From: Fam Zheng <famz@redhat.com>
+From: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Fam Zheng <famz@redhat.com>
+The lifetime of the timer is well-known (it cannot outlive
-Message-id: 20180226030326.20219-3-famz@redhat.com
+qemu_co_sleep_ns_wakeable, because it's deleted by the time the
 coroutine resumes), so it is not necessary to place it on the heap.
 Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Message-id: 20210517100548.28806-2-pbonzini@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- README | 31 ++++++++++++++++++++++++++++++-
+ util/qemu-coroutine-sleep.c | 9 ++++-----
-file changed, 30 insertions(+), 1 deletion(-)
+file changed, 4 insertions(+), 5 deletions(-)
-diff --git a/README b/README
+diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
 index XXXXXXX..XXXXXXX 100644
---- a/README
+--- a/util/qemu-coroutine-sleep.c
-+++ b/README
++++ b/util/qemu-coroutine-sleep.c
-@@ -XXX,XX +XXX,XX @@ The QEMU source code is maintained under the GIT version control system.
+@@ -XXX,XX +XXX,XX @@ static const char *qemu_co_sleep_ns__scheduled = "qemu_co_sleep_ns";
-    git clone git://git.qemu.org/qemu.git
+ struct QemuCoSleepState {
+     Coroutine *co;
--When submitting patches, the preferred approach is to use 'git
+-    QEMUTimer *ts;
-+When submitting patches, one common approach is to use 'git
++    QEMUTimer ts;
- format-patch' and/or 'git send-email' to format & send the mail to the
+     QemuCoSleepState **user_state_pointer;
- qemu-devel@nongnu.org mailing list. All patches submitted must contain
+ };
- a 'Signed-off-by' line from the author. Patches should follow the
-@@ -XXX,XX +XXX,XX @@ The QEMU website is also maintained under source control.
+@@ -XXX,XX +XXX,XX @@ void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
-   git clone git://git.qemu.org/qemu-web.git
+     if (sleep_state->user_state_pointer) {
-   https://www.qemu.org/2017/02/04/the-new-qemu-website-is-up/
+         *sleep_state->user_state_pointer = NULL;
+     }
-+A 'git-profile' utility was created to make above process less
+-    timer_del(sleep_state->ts);
-+cumbersome, and is highly recommended for making regular contributions,
++    timer_del(&sleep_state->ts);
-+or even just for sending consecutive patch series revisions. It also
+     aio_co_wake(sleep_state->co);
-+requires a working 'git send-email' setup, and by default doesn't
+ }
-+automate everything, so you may want to go through the above steps
-+manually for once.
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
-+
+     AioContext *ctx = qemu_get_current_aio_context();
-+For installation instructions, please go to
+     QemuCoSleepState state = {
-+
+         .co = qemu_coroutine_self(),
-+  https://github.com/stefanha/git-publish
+-        .ts = aio_timer_new(ctx, type, SCALE_NS, co_sleep_cb, &state),
-+
+         .user_state_pointer = sleep_state,
-+The workflow with 'git-publish' is:
+     };
-+
-+  $ git checkout master -b my-feature
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
-+  $ # work on new commits, add your 'Signed-off-by' lines to each
+         abort();
-+  $ git publish
+     }
-+
-+Your patch series will be sent and tagged as my-feature-v1 if you need to refer
++    aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, &state);
-+back to it in the future.
+     if (sleep_state) {
-+
+         *sleep_state = &state;
-+Sending v2:
+     }
-+
+-    timer_mod(state.ts, qemu_clock_get_ns(type) + ns);
-+  $ git checkout my-feature # same topic branch
++    timer_mod(&state.ts, qemu_clock_get_ns(type) + ns);
-+  $ # making changes to the commits (using 'git rebase', for example)
+     qemu_coroutine_yield();
-+  $ git publish
+     if (sleep_state) {
-+
+         /*
-+Your patch series will be sent with 'v2' tag in the subject and the git tip
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
-+will be tagged as my-feature-v2.
+          */
-+
+         assert(*sleep_state == NULL);
- Bug reporting
+     }
- =============
+-    timer_free(state.ts);
+ }
 --
-.14.3
+.31.1

-[Qemu-devel] [PULL 1/6] util/uri.c: Coding style check, Only whitespace involved
+[PULL 4/8] coroutine-sleep: disallow NULL QemuCoSleepState** argument
-From: Su Hang <suhang16@mails.ucas.ac.cn>
+From: Paolo Bonzini <pbonzini@redhat.com>
-Using `clang-format -i util/uri.c` first, then change back few code
+Simplify the code by removing conditionals.  qemu_co_sleep_ns
-manually, to make sure only whitespace involved.
+can simply point the argument to an on-stack temporary.
-Signed-off-by: Su Hang <suhang16@mails.ucas.ac.cn>
+Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Message-id: 1519533358-13759-2-git-send-email-suhang16@mails.ucas.ac.cn
+Message-id: 20210517100548.28806-3-pbonzini@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- util/uri.c | 1450 ++++++++++++++++++++++++++++++------------------------------
+ include/qemu/coroutine.h    |  5 +++--
-file changed, 726 insertions(+), 724 deletions(-)
+ util/qemu-coroutine-sleep.c | 18 +++++-------------
 files changed, 8 insertions(+), 15 deletions(-)
-diff --git a/util/uri.c b/util/uri.c
+diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
 index XXXXXXX..XXXXXXX 100644
---- a/util/uri.c
+--- a/include/qemu/coroutine.h
-+++ b/util/uri.c
++++ b/include/qemu/coroutine.h
-@@ -XXX,XX +XXX,XX @@ static void uri_clean(URI *uri);
+@@ -XXX,XX +XXX,XX @@ typedef struct QemuCoSleepState QemuCoSleepState;
   */
  #define IS_ALPHA(x) (IS_LOWALPHA(x) || IS_UPALPHA(x))
 -
  /*
   * lowalpha = "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" | "j" |
   *            "k" | "l" | "m" | "n" | "o" | "p" | "q" | "r" | "s" | "t" |
@@ -XXX,XX +XXX,XX @@ static void uri_clean(URI *uri);
   * mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
   */
 -#define IS_MARK(x) (((x) == '-') || ((x) == '_') || ((x) == '.') ||     \
 -    ((x) == '!') || ((x) == '~') || ((x) == '*') || ((x) == '\'') ||    \
 +#define IS_MARK(x) (((x) == '-') || ((x) == '_') || ((x) == '.') ||            \
 +    ((x) == '!') || ((x) == '~') || ((x) == '*') || ((x) == '\'') ||           \
      ((x) == '(') || ((x) == ')'))
  /*
   * unwise = "{" | "}" | "|" | "\" | "^" | "`"
   */
 -#define IS_UNWISE(p)                                                    \
 -      (((*(p) == '{')) || ((*(p) == '}')) || ((*(p) == '|')) ||         \
 -       ((*(p) == '\\')) || ((*(p) == '^')) || ((*(p) == '[')) ||        \
 -       ((*(p) == ']')) || ((*(p) == '`')))
 +#define IS_UNWISE(p)                                                           \
 +    (((*(p) == '{')) || ((*(p) == '}')) || ((*(p) == '|')) ||                  \
 +     ((*(p) == '\\')) || ((*(p) == '^')) || ((*(p) == '[')) ||                 \
 +     ((*(p) == ']')) || ((*(p) == '`')))
  /*
   * reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | "," |
   *            "[" | "]"
   */
 -#define IS_RESERVED(x) (((x) == ';') || ((x) == '/') || ((x) == '?') || \
 -        ((x) == ':') || ((x) == '@') || ((x) == '&') || ((x) == '=') || \
 -        ((x) == '+') || ((x) == '$') || ((x) == ',') || ((x) == '[') || \
 -        ((x) == ']'))
 +#define IS_RESERVED(x) (((x) == ';') || ((x) == '/') || ((x) == '?') ||        \
 +    ((x) == ':') || ((x) == '@') || ((x) == '&') || ((x) == '=') ||            \
 +    ((x) == '+') || ((x) == '$') || ((x) == ',') || ((x) == '[') ||            \
 +    ((x) == ']'))
  /*
   * unreserved = alphanum | mark
@@ -XXX,XX +XXX,XX @@ static void uri_clean(URI *uri);
   * Skip to next pointer char, handle escaped sequences
   */
 -#define NEXT(p) ((*p == '%')? p += 3 : p++)
 +#define NEXT(p) ((*p == '%') ? p += 3 : p++)
  /*
   * Productions from the spec.
@@ -XXX,XX +XXX,XX @@ static void uri_clean(URI *uri);
   * path          = [ abs_path | opaque_part ]
   */
 -
  /************************************************************************
 - *                                    *
 - *                         RFC 3986 parser                *
 - *                                    *
 + *                                                                      *
 + *                         RFC 3986 parser                              *
 + *                                                                      *
   ************************************************************************/
  #define ISA_DIGIT(p) ((*(p) >= '0') && (*(p) <= '9'))
 -#define ISA_ALPHA(p) (((*(p) >= 'a') && (*(p) <= 'z')) ||        \
 +#define ISA_ALPHA(p) (((*(p) >= 'a') && (*(p) <= 'z')) ||                      \
                        ((*(p) >= 'A') && (*(p) <= 'Z')))
 -#define ISA_HEXDIG(p)                            \
 -       (ISA_DIGIT(p) || ((*(p) >= 'a') && (*(p) <= 'f')) ||        \
 -        ((*(p) >= 'A') && (*(p) <= 'F')))
 +#define ISA_HEXDIG(p)                                                          \
 +    (ISA_DIGIT(p) || ((*(p) >= 'a') && (*(p) <= 'f')) ||                       \
 +     ((*(p) >= 'A') && (*(p) <= 'F')))
  /*
   *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
   *                     / "*" / "+" / "," / ";" / "="
   */
 -#define ISA_SUB_DELIM(p)                        \
 -      (((*(p) == '!')) || ((*(p) == '$')) || ((*(p) == '&')) ||        \
 -       ((*(p) == '(')) || ((*(p) == ')')) || ((*(p) == '*')) ||        \
 -       ((*(p) == '+')) || ((*(p) == ',')) || ((*(p) == ';')) ||        \
 -       ((*(p) == '=')) || ((*(p) == '\'')))
 +#define ISA_SUB_DELIM(p)                                                       \
 +    (((*(p) == '!')) || ((*(p) == '$')) || ((*(p) == '&')) ||                  \
 +     ((*(p) == '(')) || ((*(p) == ')')) || ((*(p) == '*')) ||                  \
 +     ((*(p) == '+')) || ((*(p) == ',')) || ((*(p) == ';')) ||                  \
 +     ((*(p) == '=')) || ((*(p) == '\'')))
  /*
   *    gen-delims    = ":" / "/" / "?" / "#" / "[" / "]" / "@"
   */
 -#define ISA_GEN_DELIM(p)                        \
 -      (((*(p) == ':')) || ((*(p) == '/')) || ((*(p) == '?')) ||         \
 -       ((*(p) == '#')) || ((*(p) == '[')) || ((*(p) == ']')) ||         \
 -       ((*(p) == '@')))
 +#define ISA_GEN_DELIM(p)                                                       \
 +    (((*(p) == ':')) || ((*(p) == '/')) || ((*(p) == '?')) ||                  \
 +     ((*(p) == '#')) || ((*(p) == '[')) || ((*(p) == ']')) ||                  \
 +     ((*(p) == '@')))
  /*
   *    reserved      = gen-delims / sub-delims
@@ -XXX,XX +XXX,XX @@ static void uri_clean(URI *uri);
  /*
   *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
   */
 -#define ISA_UNRESERVED(p)                        \
 -      ((ISA_ALPHA(p)) || (ISA_DIGIT(p)) || ((*(p) == '-')) ||        \
 -       ((*(p) == '.')) || ((*(p) == '_')) || ((*(p) == '~')))
 +#define ISA_UNRESERVED(p)                                                      \
 +    ((ISA_ALPHA(p)) || (ISA_DIGIT(p)) || ((*(p) == '-')) ||                    \
 +     ((*(p) == '.')) || ((*(p) == '_')) || ((*(p) == '~')))
  /*
   *    pct-encoded   = "%" HEXDIG HEXDIG
   */
 -#define ISA_PCT_ENCODED(p)                        \
 -     ((*(p) == '%') && (ISA_HEXDIG(p + 1)) && (ISA_HEXDIG(p + 2)))
 +#define ISA_PCT_ENCODED(p)                                                     \
 +    ((*(p) == '%') && (ISA_HEXDIG(p + 1)) && (ISA_HEXDIG(p + 2)))
  /*
   *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
   */
 -#define ISA_PCHAR(p)                            \
 -     (ISA_UNRESERVED(p) || ISA_PCT_ENCODED(p) || ISA_SUB_DELIM(p) ||    \
 -      ((*(p) == ':')) || ((*(p) == '@')))
 +#define ISA_PCHAR(p)                                                           \
 +    (ISA_UNRESERVED(p) || ISA_PCT_ENCODED(p) || ISA_SUB_DELIM(p) ||            \
 +     ((*(p) == ':')) || ((*(p) == '@')))
  /**
-  * rfc3986_parse_scheme:
+  * Yield the coroutine for a given duration. During this yield, @sleep_state
-@@ -XXX,XX +XXX,XX @@ static void uri_clean(URI *uri);
+- * (if not NULL) is set to an opaque pointer, which may be used for
-  *
++ * is set to an opaque pointer, which may be used for
-  * Returns 0 or the error code
+  * qemu_co_sleep_wake(). Be careful, the pointer is set back to zero when the
-  */
+  * timer fires. Don't save the obtained value to other variables and don't call
--static int
+  * qemu_co_sleep_wake from another aio context.
--rfc3986_parse_scheme(URI *uri, const char **str) {
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
-+static int rfc3986_parse_scheme(URI *uri, const char **str)
+                                             QemuCoSleepState **sleep_state);
-+{
+ static inline void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns)
-     const char *cur;
+ {
+-    qemu_co_sleep_ns_wakeable(type, ns, NULL);
-     if (str == NULL)
++    QemuCoSleepState *unused = NULL;
--    return(-1);
++    qemu_co_sleep_ns_wakeable(type, ns, &unused);
-+        return (-1);
+ }
-     cur = *str;
+ /**
-     if (!ISA_ALPHA(cur))
+diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
--    return(2);
+index XXXXXXX..XXXXXXX 100644
-+        return (2);
+--- a/util/qemu-coroutine-sleep.c
-     cur++;
++++ b/util/qemu-coroutine-sleep.c
--    while (ISA_ALPHA(cur) || ISA_DIGIT(cur) ||
+@@ -XXX,XX +XXX,XX @@ void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
--           (*cur == '+') || (*cur == '-') || (*cur == '.')) cur++;
+                                            qemu_co_sleep_ns__scheduled, NULL);
-+    while (ISA_ALPHA(cur) || ISA_DIGIT(cur) || (*cur == '+') || (*cur == '-') ||
-+           (*cur == '.'))
+     assert(scheduled == qemu_co_sleep_ns__scheduled);
-+        cur++;
+-    if (sleep_state->user_state_pointer) {
-     if (uri != NULL) {
+-        *sleep_state->user_state_pointer = NULL;
-         g_free(uri->scheme);
+-    }
--    uri->scheme = g_strndup(*str, cur - *str);
++    *sleep_state->user_state_pointer = NULL;
-+        uri->scheme = g_strndup(*str, cur - *str);
+     timer_del(&sleep_state->ts);
      aio_co_wake(sleep_state->co);
  }
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
      }
-     *str = cur;
--    return(0);
+     aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, &state);
-+    return (0);
+-    if (sleep_state) {
 -        *sleep_state = &state;
 -    }
 +    *sleep_state = &state;
      timer_mod(&state.ts, qemu_clock_get_ns(type) + ns);
      qemu_coroutine_yield();
 -    if (sleep_state) {
 -        /*
 -         * Note that *sleep_state is cleared during qemu_co_sleep_wake
 -         * before resuming this coroutine.
 -         */
 -        assert(*sleep_state == NULL);
 -    }
 +
 +    /* qemu_co_sleep_wake clears *sleep_state before resuming this coroutine.  */
 +    assert(*sleep_state == NULL);
  }
- /**
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_scheme(URI *uri, const char **str) {
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_fragment(URI *uri, const char **str)
-+static int rfc3986_parse_fragment(URI *uri, const char **str)
- {
-     const char *cur;
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_fragment(URI *uri, const char **str)
-         NEXT(cur);
-     if (uri != NULL) {
-         g_free(uri->fragment);
--    if (uri->cleanup & 2)
--        uri->fragment = g_strndup(*str, cur - *str);
--    else
--        uri->fragment = uri_string_unescape(*str, cur - *str, NULL);
-+        if (uri->cleanup & 2)
-+            uri->fragment = g_strndup(*str, cur - *str);
-+        else
-+            uri->fragment = uri_string_unescape(*str, cur - *str, NULL);
-     }
-     *str = cur;
-     return (0);
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_fragment(URI *uri, const char **str)
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_query(URI *uri, const char **str)
-+static int rfc3986_parse_query(URI *uri, const char **str)
- {
-     const char *cur;
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_query(URI *uri, const char **str)
-         NEXT(cur);
-     if (uri != NULL) {
-         g_free(uri->query);
--    uri->query = g_strndup (*str, cur - *str);
-+        uri->query = g_strndup(*str, cur - *str);
-     }
-     *str = cur;
-     return (0);
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_query(URI *uri, const char **str)
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_port(URI *uri, const char **str)
-+static int rfc3986_parse_port(URI *uri, const char **str)
- {
-     const char *cur = *str;
-     int port = 0;
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_port(URI *uri, const char **str)
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_user_info(URI *uri, const char **str)
-+static int rfc3986_parse_user_info(URI *uri, const char **str)
- {
-     const char *cur;
-     cur = *str;
--    while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) ||
--           ISA_SUB_DELIM(cur) || (*cur == ':'))
--    NEXT(cur);
-+    while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cur) ||
-+           (*cur == ':'))
-+        NEXT(cur);
-     if (*cur == '@') {
--    if (uri != NULL) {
-+        if (uri != NULL) {
-             g_free(uri->user);
--        if (uri->cleanup & 2)
--        uri->user = g_strndup(*str, cur - *str);
--        else
--        uri->user = uri_string_unescape(*str, cur - *str, NULL);
--    }
--    *str = cur;
--    return(0);
-+            if (uri->cleanup & 2)
-+                uri->user = g_strndup(*str, cur - *str);
-+            else
-+                uri->user = uri_string_unescape(*str, cur - *str, NULL);
-+        }
-+        *str = cur;
-+        return (0);
-     }
--    return(1);
-+    return (1);
- }
- /**
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_user_info(URI *uri, const char **str)
-  *
-  * Returns 0 if found and skipped, 1 otherwise
-  */
--static int
--rfc3986_parse_dec_octet(const char **str) {
-+static int rfc3986_parse_dec_octet(const char **str)
-+{
-     const char *cur = *str;
-     if (!(ISA_DIGIT(cur)))
--        return(1);
--    if (!ISA_DIGIT(cur+1))
--    cur++;
--    else if ((*cur != '0') && (ISA_DIGIT(cur + 1)) && (!ISA_DIGIT(cur+2)))
--    cur += 2;
-+        return (1);
-+    if (!ISA_DIGIT(cur + 1))
-+        cur++;
-+    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)))
--    cur += 3;
--    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'))
--    cur += 3;
-+        cur += 3;
-+    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'))
-+        cur += 3;
-     else
--        return(1);
-+        return (1);
-     *str = cur;
--    return(0);
-+    return (0);
- }
- /**
-  * rfc3986_parse_host:
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_dec_octet(const char **str) {
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_host(URI *uri, const char **str)
-+static int rfc3986_parse_host(URI *uri, const char **str)
- {
-     const char *cur = *str;
-     const char *host;
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_host(URI *uri, const char **str)
-      */
-     if (*cur == '[') {
-         cur++;
--    while ((*cur != ']') && (*cur != 0))
--        cur++;
--    if (*cur != ']')
--        return(1);
--    cur++;
--    goto found;
-+        while ((*cur != ']') && (*cur != 0))
-+            cur++;
-+        if (*cur != ']')
-+            return (1);
-+        cur++;
-+        goto found;
-     }
-     /*
-      * try to parse an IPv4
-      */
-     if (ISA_DIGIT(cur)) {
-         if (rfc3986_parse_dec_octet(&cur) != 0)
--        goto not_ipv4;
--    if (*cur != '.')
--        goto not_ipv4;
--    cur++;
-+            goto not_ipv4;
-+        if (*cur != '.')
-+            goto not_ipv4;
-+        cur++;
-         if (rfc3986_parse_dec_octet(&cur) != 0)
--        goto not_ipv4;
--    if (*cur != '.')
--        goto not_ipv4;
-+            goto not_ipv4;
-+        if (*cur != '.')
-+            goto not_ipv4;
-         if (rfc3986_parse_dec_octet(&cur) != 0)
--        goto not_ipv4;
--    if (*cur != '.')
--        goto not_ipv4;
-+            goto not_ipv4;
-+        if (*cur != '.')
-+            goto not_ipv4;
-         if (rfc3986_parse_dec_octet(&cur) != 0)
--        goto not_ipv4;
--    goto found;
--not_ipv4:
-+            goto not_ipv4;
-+        goto found;
-+    not_ipv4:
-         cur = *str;
-     }
-     /*
-@@ -XXX,XX +XXX,XX @@ not_ipv4:
- found:
-     if (uri != NULL) {
-         g_free(uri->authority);
--    uri->authority = NULL;
-+        uri->authority = NULL;
-         g_free(uri->server);
--    if (cur != host) {
--        if (uri->cleanup & 2)
--        uri->server = g_strndup(host, cur - host);
--        else
--        uri->server = uri_string_unescape(host, cur - host, NULL);
--    } else
--        uri->server = NULL;
-+        if (cur != host) {
-+            if (uri->cleanup & 2)
-+                uri->server = g_strndup(host, cur - host);
-+            else
-+                uri->server = uri_string_unescape(host, cur - host, NULL);
-+        } else
-+            uri->server = NULL;
-     }
-     *str = cur;
--    return(0);
-+    return (0);
- }
- /**
-@@ -XXX,XX +XXX,XX @@ found:
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_authority(URI *uri, const char **str)
-+static int rfc3986_parse_authority(URI *uri, const char **str)
- {
-     const char *cur;
-     int ret;
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_authority(URI *uri, const char **str)
-     else
-         cur++;
-     ret = rfc3986_parse_host(uri, &cur);
--    if (ret != 0) return(ret);
-+    if (ret != 0)
-+        return (ret);
-     if (*cur == ':') {
-         cur++;
-         ret = rfc3986_parse_port(uri, &cur);
--    if (ret != 0) return(ret);
-+        if (ret != 0)
-+            return (ret);
-     }
-     *str = cur;
--    return(0);
-+    return (0);
- }
- /**
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_authority(URI *uri, const char **str)
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_segment(const char **str, char forbid, int empty)
-+static int rfc3986_parse_segment(const char **str, char forbid, int empty)
- {
-     const char *cur;
-     cur = *str;
-     if (!ISA_PCHAR(cur)) {
-         if (empty)
--        return(0);
--    return(1);
-+            return (0);
-+        return (1);
-     }
-     while (ISA_PCHAR(cur) && (*cur != forbid))
-         NEXT(cur);
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_segment(const char **str, char forbid, int empty)
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_path_ab_empty(URI *uri, const char **str)
-+static int rfc3986_parse_path_ab_empty(URI *uri, const char **str)
- {
-     const char *cur;
-     int ret;
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_ab_empty(URI *uri, const char **str)
-     while (*cur == '/') {
-         cur++;
--    ret = rfc3986_parse_segment(&cur, 0, 1);
--    if (ret != 0) return(ret);
-+        ret = rfc3986_parse_segment(&cur, 0, 1);
-+        if (ret != 0)
-+            return (ret);
-     }
-     if (uri != NULL) {
-         g_free(uri->path);
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_ab_empty(URI *uri, const char **str)
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_path_absolute(URI *uri, const char **str)
-+static int rfc3986_parse_path_absolute(URI *uri, const char **str)
- {
-     const char *cur;
-     int ret;
-@@ -XXX,XX +XXX,XX @@ 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) {
--    while (*cur == '/') {
--        cur++;
--        ret = rfc3986_parse_segment(&cur, 0, 1);
--        if (ret != 0) return(ret);
--    }
-+        while (*cur == '/') {
-+            cur++;
-+            ret = rfc3986_parse_segment(&cur, 0, 1);
-+            if (ret != 0)
-+                return (ret);
-+        }
-     }
-     if (uri != NULL) {
-         g_free(uri->path);
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_absolute(URI *uri, const char **str)
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_path_rootless(URI *uri, const char **str)
-+static int rfc3986_parse_path_rootless(URI *uri, const char **str)
- {
-     const char *cur;
-     int ret;
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_rootless(URI *uri, const char **str)
-     cur = *str;
-     ret = rfc3986_parse_segment(&cur, 0, 0);
--    if (ret != 0) return(ret);
-+    if (ret != 0)
-+        return (ret);
-     while (*cur == '/') {
-         cur++;
--    ret = rfc3986_parse_segment(&cur, 0, 1);
--    if (ret != 0) return(ret);
-+        ret = rfc3986_parse_segment(&cur, 0, 1);
-+        if (ret != 0)
-+            return (ret);
-     }
-     if (uri != NULL) {
-         g_free(uri->path);
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_rootless(URI *uri, const char **str)
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_path_no_scheme(URI *uri, const char **str)
-+static int rfc3986_parse_path_no_scheme(URI *uri, const char **str)
- {
-     const char *cur;
-     int ret;
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_no_scheme(URI *uri, const char **str)
-     cur = *str;
-     ret = rfc3986_parse_segment(&cur, ':', 0);
--    if (ret != 0) return(ret);
-+    if (ret != 0)
-+        return (ret);
-     while (*cur == '/') {
-         cur++;
--    ret = rfc3986_parse_segment(&cur, 0, 1);
--    if (ret != 0) return(ret);
-+        ret = rfc3986_parse_segment(&cur, 0, 1);
-+        if (ret != 0)
-+            return (ret);
-     }
-     if (uri != NULL) {
-         g_free(uri->path);
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_no_scheme(URI *uri, const char **str)
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_hier_part(URI *uri, const char **str)
-+static int rfc3986_parse_hier_part(URI *uri, const char **str)
- {
-     const char *cur;
-     int ret;
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_hier_part(URI *uri, const char **str)
-     if ((*cur == '/') && (*(cur + 1) == '/')) {
-         cur += 2;
--    ret = rfc3986_parse_authority(uri, &cur);
--    if (ret != 0) return(ret);
--    ret = rfc3986_parse_path_ab_empty(uri, &cur);
--    if (ret != 0) return(ret);
--    *str = cur;
--    return(0);
-+        ret = rfc3986_parse_authority(uri, &cur);
-+        if (ret != 0)
-+            return (ret);
-+        ret = rfc3986_parse_path_ab_empty(uri, &cur);
-+        if (ret != 0)
-+            return (ret);
-+        *str = cur;
-+        return (0);
-     } else if (*cur == '/') {
-         ret = rfc3986_parse_path_absolute(uri, &cur);
--    if (ret != 0) return(ret);
-+        if (ret != 0)
-+            return (ret);
-     } else if (ISA_PCHAR(cur)) {
-         ret = rfc3986_parse_path_rootless(uri, &cur);
--    if (ret != 0) return(ret);
-+        if (ret != 0)
-+            return (ret);
-     } else {
--    /* path-empty is effectively empty */
--    if (uri != NULL) {
-+        /* path-empty is effectively empty */
-+        if (uri != NULL) {
-             g_free(uri->path);
--        uri->path = NULL;
--    }
-+            uri->path = NULL;
-+        }
-     }
-     *str = cur;
-     return (0);
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_hier_part(URI *uri, const char **str)
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_relative_ref(URI *uri, const char *str) {
-+static int rfc3986_parse_relative_ref(URI *uri, const char *str)
-+{
-     int ret;
-     if ((*str == '/') && (*(str + 1) == '/')) {
-         str += 2;
--    ret = rfc3986_parse_authority(uri, &str);
--    if (ret != 0) return(ret);
--    ret = rfc3986_parse_path_ab_empty(uri, &str);
--    if (ret != 0) return(ret);
-+        ret = rfc3986_parse_authority(uri, &str);
-+        if (ret != 0)
-+            return (ret);
-+        ret = rfc3986_parse_path_ab_empty(uri, &str);
-+        if (ret != 0)
-+            return (ret);
-     } else if (*str == '/') {
--    ret = rfc3986_parse_path_absolute(uri, &str);
--    if (ret != 0) return(ret);
-+        ret = rfc3986_parse_path_absolute(uri, &str);
-+        if (ret != 0)
-+            return (ret);
-     } else if (ISA_PCHAR(str)) {
-         ret = rfc3986_parse_path_no_scheme(uri, &str);
--    if (ret != 0) return(ret);
-+        if (ret != 0)
-+            return (ret);
-     } else {
--    /* path-empty is effectively empty */
--    if (uri != NULL) {
-+        /* path-empty is effectively empty */
-+        if (uri != NULL) {
-             g_free(uri->path);
--        uri->path = NULL;
--    }
-+            uri->path = NULL;
-+        }
-     }
-     if (*str == '?') {
--    str++;
--    ret = rfc3986_parse_query(uri, &str);
--    if (ret != 0) return(ret);
-+        str++;
-+        ret = rfc3986_parse_query(uri, &str);
-+        if (ret != 0)
-+            return (ret);
-     }
-     if (*str == '#') {
--    str++;
--    ret = rfc3986_parse_fragment(uri, &str);
--    if (ret != 0) return(ret);
-+        str++;
-+        ret = rfc3986_parse_fragment(uri, &str);
-+        if (ret != 0)
-+            return (ret);
-     }
-     if (*str != 0) {
--    uri_clean(uri);
--    return(1);
-+        uri_clean(uri);
-+        return (1);
-     }
--    return(0);
-+    return (0);
- }
--
- /**
-  * rfc3986_parse:
-  * @uri:  pointer to an URI structure
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_relative_ref(URI *uri, const char *str) {
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse(URI *uri, const char *str) {
-+static int rfc3986_parse(URI *uri, const char *str)
-+{
-     int ret;
-     ret = rfc3986_parse_scheme(uri, &str);
--    if (ret != 0) return(ret);
-+    if (ret != 0)
-+        return (ret);
-     if (*str != ':') {
--    return(1);
-+        return (1);
-     }
-     str++;
-     ret = rfc3986_parse_hier_part(uri, &str);
--    if (ret != 0) return(ret);
-+    if (ret != 0)
-+        return (ret);
-     if (*str == '?') {
--    str++;
--    ret = rfc3986_parse_query(uri, &str);
--    if (ret != 0) return(ret);
-+        str++;
-+        ret = rfc3986_parse_query(uri, &str);
-+        if (ret != 0)
-+            return (ret);
-     }
-     if (*str == '#') {
--    str++;
--    ret = rfc3986_parse_fragment(uri, &str);
--    if (ret != 0) return(ret);
-+        str++;
-+        ret = rfc3986_parse_fragment(uri, &str);
-+        if (ret != 0)
-+            return (ret);
-     }
-     if (*str != 0) {
--    uri_clean(uri);
--    return(1);
-+        uri_clean(uri);
-+        return (1);
-     }
--    return(0);
-+    return (0);
- }
- /**
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse(URI *uri, const char *str) {
-  *
-  * Returns 0 or the error code
-  */
--static int
--rfc3986_parse_uri_reference(URI *uri, const char *str) {
-+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 @@ rfc3986_parse_uri_reference(URI *uri, const char *str) {
-      */
-     ret = rfc3986_parse(uri, str);
-     if (ret != 0) {
--    uri_clean(uri);
-+        uri_clean(uri);
-         ret = rfc3986_parse_relative_ref(uri, str);
--    if (ret != 0) {
--        uri_clean(uri);
--        return(ret);
--    }
-+        if (ret != 0) {
-+            uri_clean(uri);
-+            return (ret);
-+        }
-     }
--    return(0);
-+    return (0);
- }
- /**
-@@ -XXX,XX +XXX,XX @@ rfc3986_parse_uri_reference(URI *uri, const char *str) {
-  *
-  * Returns a newly built URI or NULL in case of error
-  */
--URI *
--uri_parse(const char *str) {
-+URI *uri_parse(const char *str)
-+{
-     URI *uri;
-     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_parse(const char *str) {
-  *
-  * Returns 0 or the error code
-  */
--int
--uri_parse_into(URI *uri, const char *str) {
--    return(rfc3986_parse_uri_reference(uri, str));
-+int uri_parse_into(URI *uri, const char *str)
-+{
-+    return (rfc3986_parse_uri_reference(uri, str));
- }
- /**
-@@ -XXX,XX +XXX,XX @@ uri_parse_into(URI *uri, const char *str) {
-  *
-  * Returns a newly built URI or NULL in case of error
-  */
--URI *
--uri_parse_raw(const char *str, int raw) {
-+URI *uri_parse_raw(const char *str, int raw)
-+{
-     URI *uri;
-     int ret;
-     if (str == NULL)
--    return(NULL);
-+        return (NULL);
-     uri = uri_new();
-     if (raw) {
-         uri->cleanup |= 2;
-@@ -XXX,XX +XXX,XX @@ 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);
- }
- /************************************************************************
-- *                                    *
-- *            Generic URI structure functions            *
-- *                                    *
-+ *                                                                      *
-+ *                    Generic URI structure functions                   *
-+ *                                                                      *
-  ************************************************************************/
- /**
-@@ -XXX,XX +XXX,XX @@ uri_parse_raw(const char *str, int raw) {
-  *
-  * Returns the new structure or NULL in case of error
-  */
--URI *
--uri_new(void) {
-+URI *uri_new(void)
-+{
-     URI *ret;
-     ret = g_new0(URI, 1);
--    return(ret);
-+    return (ret);
- }
- /**
-@@ -XXX,XX +XXX,XX @@ uri_new(void) {
-  * Function to handle properly a reallocation when saving an URI
-  * Also imposes some limit on the length of an URI string output
-  */
--static char *
--realloc2n(char *ret, int *max) {
-+static char *realloc2n(char *ret, int *max)
-+{
-     char *temp;
-     int tmp;
-     tmp = *max * 2;
-     temp = g_realloc(ret, (tmp + 1));
-     *max = tmp;
--    return(temp);
-+    return (temp);
- }
- /**
-@@ -XXX,XX +XXX,XX @@ realloc2n(char *ret, int *max) {
-  *
-  * Returns a new string (to be deallocated by caller)
-  */
--char *
--uri_to_string(URI *uri) {
-+char *uri_to_string(URI *uri)
-+{
-     char *ret = NULL;
-     char *temp;
-     const char *p;
-     int len;
-     int max;
--    if (uri == NULL) return(NULL);
--
-+    if (uri == NULL)
-+        return (NULL);
-     max = 80;
-     ret = g_malloc(max + 1);
-     len = 0;
-     if (uri->scheme != NULL) {
--    p = uri->scheme;
--    while (*p != 0) {
--        if (len >= max) {
-+        p = uri->scheme;
-+        while (*p != 0) {
-+            if (len >= max) {
-                 temp = realloc2n(ret, &max);
--        ret = temp;
--        }
--        ret[len++] = *p++;
--    }
--    if (len >= max) {
-+                ret = temp;
-+            }
-+            ret[len++] = *p++;
-+        }
-+        if (len >= max) {
-             temp = realloc2n(ret, &max);
-             ret = temp;
--    }
--    ret[len++] = ':';
-+        }
-+        ret[len++] = ':';
-     }
-     if (uri->opaque != NULL) {
--    p = uri->opaque;
--    while (*p != 0) {
--        if (len + 3 >= max) {
-+        p = uri->opaque;
-+        while (*p != 0) {
-+            if (len + 3 >= max) {
-                 temp = realloc2n(ret, &max);
-                 ret = temp;
--        }
--        if (IS_RESERVED(*(p)) || IS_UNRESERVED(*(p)))
--        ret[len++] = *p++;
--        else {
--        int val = *(unsigned char *)p++;
--        int hi = val / 0x10, lo = val % 0x10;
--        ret[len++] = '%';
--        ret[len++] = hi + (hi > 9? 'A'-10 : '0');
--        ret[len++] = lo + (lo > 9? 'A'-10 : '0');
--        }
--    }
-+            }
-+            if (IS_RESERVED(*(p)) || IS_UNRESERVED(*(p)))
-+                ret[len++] = *p++;
-+            else {
-+                int val = *(unsigned char *)p++;
-+                int hi = val / 0x10, lo = val % 0x10;
-+                ret[len++] = '%';
-+                ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
-+                ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
-+            }
-+        }
-     } else {
--    if (uri->server != NULL) {
--        if (len + 3 >= max) {
-+        if (uri->server != NULL) {
-+            if (len + 3 >= max) {
-                 temp = realloc2n(ret, &max);
-                 ret = temp;
--        }
--        ret[len++] = '/';
--        ret[len++] = '/';
--        if (uri->user != NULL) {
--        p = uri->user;
--        while (*p != 0) {
--            if (len + 3 >= max) {
-+            }
-+            ret[len++] = '/';
-+            ret[len++] = '/';
-+            if (uri->user != NULL) {
-+                p = uri->user;
-+                while (*p != 0) {
-+                    if (len + 3 >= max) {
-                         temp = realloc2n(ret, &max);
-                         ret = temp;
--            }
--            if ((IS_UNRESERVED(*(p))) ||
--            ((*(p) == ';')) || ((*(p) == ':')) ||
--            ((*(p) == '&')) || ((*(p) == '=')) ||
--            ((*(p) == '+')) || ((*(p) == '$')) ||
--            ((*(p) == ',')))
--            ret[len++] = *p++;
--            else {
--            int val = *(unsigned char *)p++;
--            int hi = val / 0x10, lo = val % 0x10;
--            ret[len++] = '%';
--            ret[len++] = hi + (hi > 9? 'A'-10 : '0');
--            ret[len++] = lo + (lo > 9? 'A'-10 : '0');
--            }
--        }
--        if (len + 3 >= max) {
-+                    }
-+                    if ((IS_UNRESERVED(*(p))) || ((*(p) == ';')) ||
-+                        ((*(p) == ':')) || ((*(p) == '&')) || ((*(p) == '=')) ||
-+                        ((*(p) == '+')) || ((*(p) == '$')) || ((*(p) == ',')))
-+                        ret[len++] = *p++;
-+                    else {
-+                        int val = *(unsigned char *)p++;
-+                        int hi = val / 0x10, lo = val % 0x10;
-+                        ret[len++] = '%';
-+                        ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
-+                        ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
-+                    }
-+                }
-+                if (len + 3 >= max) {
-                     temp = realloc2n(ret, &max);
-                     ret = temp;
--        }
--        ret[len++] = '@';
--        }
--        p = uri->server;
--        while (*p != 0) {
--        if (len >= max) {
-+                }
-+                ret[len++] = '@';
-+            }
-+            p = uri->server;
-+            while (*p != 0) {
-+                if (len >= max) {
-                     temp = realloc2n(ret, &max);
-                     ret = temp;
--        }
--        ret[len++] = *p++;
--        }
--        if (uri->port > 0) {
--        if (len + 10 >= max) {
-+                }
-+                ret[len++] = *p++;
-+            }
-+            if (uri->port > 0) {
-+                if (len + 10 >= max) {
-                     temp = realloc2n(ret, &max);
-                     ret = temp;
--        }
--        len += snprintf(&ret[len], max - len, ":%d", uri->port);
--        }
--    } else if (uri->authority != NULL) {
--        if (len + 3 >= max) {
-+                }
-+                len += snprintf(&ret[len], max - len, ":%d", uri->port);
-+            }
-+        } else if (uri->authority != NULL) {
-+            if (len + 3 >= max) {
-                 temp = realloc2n(ret, &max);
-                 ret = temp;
--        }
--        ret[len++] = '/';
--        ret[len++] = '/';
--        p = uri->authority;
--        while (*p != 0) {
--        if (len + 3 >= max) {
-+            }
-+            ret[len++] = '/';
-+            ret[len++] = '/';
-+            p = uri->authority;
-+            while (*p != 0) {
-+                if (len + 3 >= max) {
-                     temp = realloc2n(ret, &max);
-                     ret = temp;
--        }
--        if ((IS_UNRESERVED(*(p))) ||
--                    ((*(p) == '$')) || ((*(p) == ',')) || ((*(p) == ';')) ||
--                    ((*(p) == ':')) || ((*(p) == '@')) || ((*(p) == '&')) ||
--                    ((*(p) == '=')) || ((*(p) == '+')))
--            ret[len++] = *p++;
--        else {
--            int val = *(unsigned char *)p++;
--            int hi = val / 0x10, lo = val % 0x10;
--            ret[len++] = '%';
--            ret[len++] = hi + (hi > 9? 'A'-10 : '0');
--            ret[len++] = lo + (lo > 9? 'A'-10 : '0');
--        }
--        }
--    } else if (uri->scheme != NULL) {
--        if (len + 3 >= max) {
-+                }
-+                if ((IS_UNRESERVED(*(p))) || ((*(p) == '$')) ||
-+                    ((*(p) == ',')) || ((*(p) == ';')) || ((*(p) == ':')) ||
-+                    ((*(p) == '@')) || ((*(p) == '&')) || ((*(p) == '=')) ||
-+                    ((*(p) == '+')))
-+                    ret[len++] = *p++;
-+                else {
-+                    int val = *(unsigned char *)p++;
-+                    int hi = val / 0x10, lo = val % 0x10;
-+                    ret[len++] = '%';
-+                    ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
-+                    ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
-+                }
-+            }
-+        } else if (uri->scheme != NULL) {
-+            if (len + 3 >= max) {
-                 temp = realloc2n(ret, &max);
-                 ret = temp;
--        }
--        ret[len++] = '/';
--        ret[len++] = '/';
--    }
--    if (uri->path != NULL) {
--        p = uri->path;
--        /*
--         * the colon in file:///d: should not be escaped or
--         * Windows accesses fail later.
--         */
--        if ((uri->scheme != NULL) &&
--        (p[0] == '/') &&
--        (((p[1] >= 'a') && (p[1] <= 'z')) ||
--         ((p[1] >= 'A') && (p[1] <= 'Z'))) &&
--        (p[2] == ':') &&
--            (!strcmp(uri->scheme, "file"))) {
--        if (len + 3 >= max) {
-+            }
-+            ret[len++] = '/';
-+            ret[len++] = '/';
-+        }
-+        if (uri->path != NULL) {
-+            p = uri->path;
-+            /*
-+             * the colon in file:///d: should not be escaped or
-+             * Windows accesses fail later.
-+             */
-+            if ((uri->scheme != NULL) && (p[0] == '/') &&
-+                (((p[1] >= 'a') && (p[1] <= 'z')) ||
-+                 ((p[1] >= 'A') && (p[1] <= 'Z'))) &&
-+                (p[2] == ':') && (!strcmp(uri->scheme, "file"))) {
-+                if (len + 3 >= max) {
-                     temp = realloc2n(ret, &max);
-                     ret = temp;
--        }
--        ret[len++] = *p++;
--        ret[len++] = *p++;
--        ret[len++] = *p++;
--        }
--        while (*p != 0) {
--        if (len + 3 >= max) {
-+                }
-+                ret[len++] = *p++;
-+                ret[len++] = *p++;
-+                ret[len++] = *p++;
-+            }
-+            while (*p != 0) {
-+                if (len + 3 >= max) {
-                     temp = realloc2n(ret, &max);
-                     ret = temp;
--        }
--        if ((IS_UNRESERVED(*(p))) || ((*(p) == '/')) ||
-+                }
-+                if ((IS_UNRESERVED(*(p))) || ((*(p) == '/')) ||
-                     ((*(p) == ';')) || ((*(p) == '@')) || ((*(p) == '&')) ||
--                ((*(p) == '=')) || ((*(p) == '+')) || ((*(p) == '$')) ||
--                ((*(p) == ',')))
--            ret[len++] = *p++;
--        else {
--            int val = *(unsigned char *)p++;
--            int hi = val / 0x10, lo = val % 0x10;
--            ret[len++] = '%';
--            ret[len++] = hi + (hi > 9? 'A'-10 : '0');
--            ret[len++] = lo + (lo > 9? 'A'-10 : '0');
--        }
--        }
--    }
--    if (uri->query != NULL) {
--        if (len + 1 >= max) {
-+                    ((*(p) == '=')) || ((*(p) == '+')) || ((*(p) == '$')) ||
-+                    ((*(p) == ',')))
-+                    ret[len++] = *p++;
-+                else {
-+                    int val = *(unsigned char *)p++;
-+                    int hi = val / 0x10, lo = val % 0x10;
-+                    ret[len++] = '%';
-+                    ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
-+                    ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
-+                }
-+            }
-+        }
-+        if (uri->query != NULL) {
-+            if (len + 1 >= max) {
-                 temp = realloc2n(ret, &max);
-                 ret = temp;
--        }
--        ret[len++] = '?';
--        p = uri->query;
--        while (*p != 0) {
--        if (len + 1 >= max) {
-+            }
-+            ret[len++] = '?';
-+            p = uri->query;
-+            while (*p != 0) {
-+                if (len + 1 >= max) {
-                     temp = realloc2n(ret, &max);
-                     ret = temp;
--        }
--        ret[len++] = *p++;
--        }
--    }
-+                }
-+                ret[len++] = *p++;
-+            }
-+        }
-     }
-     if (uri->fragment != NULL) {
--    if (len + 3 >= max) {
-+        if (len + 3 >= max) {
-             temp = realloc2n(ret, &max);
-             ret = temp;
--    }
--    ret[len++] = '#';
--    p = uri->fragment;
--    while (*p != 0) {
--        if (len + 3 >= max) {
-+        }
-+        ret[len++] = '#';
-+        p = uri->fragment;
-+        while (*p != 0) {
-+            if (len + 3 >= max) {
-                 temp = realloc2n(ret, &max);
-                 ret = temp;
--        }
--        if ((IS_UNRESERVED(*(p))) || (IS_RESERVED(*(p))))
--        ret[len++] = *p++;
--        else {
--        int val = *(unsigned char *)p++;
--        int hi = val / 0x10, lo = val % 0x10;
--        ret[len++] = '%';
--        ret[len++] = hi + (hi > 9? 'A'-10 : '0');
--        ret[len++] = lo + (lo > 9? 'A'-10 : '0');
--        }
--    }
-+            }
-+            if ((IS_UNRESERVED(*(p))) || (IS_RESERVED(*(p))))
-+                ret[len++] = *p++;
-+            else {
-+                int val = *(unsigned char *)p++;
-+                int hi = val / 0x10, lo = val % 0x10;
-+                ret[len++] = '%';
-+                ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
-+                ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
-+            }
-+        }
-     }
-     if (len >= max) {
-         temp = realloc2n(ret, &max);
-         ret = temp;
-     }
-     ret[len] = 0;
--    return(ret);
-+    return (ret);
- }
- /**
-@@ -XXX,XX +XXX,XX @@ uri_to_string(URI *uri) {
-  *
-  * Make sure the URI struct is free of content
-  */
--static void
--uri_clean(URI *uri) {
--    if (uri == NULL) return;
-+static void uri_clean(URI *uri)
-+{
-+    if (uri == NULL)
-+        return;
-     g_free(uri->scheme);
-     uri->scheme = NULL;
-@@ -XXX,XX +XXX,XX @@ uri_clean(URI *uri) {
-  *
-  * Free up the URI struct
-  */
--void
--uri_free(URI *uri) {
-+void uri_free(URI *uri)
-+{
-     uri_clean(uri);
-     g_free(uri);
- }
- /************************************************************************
-- *                                    *
-- *            Helper functions                *
-- *                                    *
-+ *                                                                      *
-+ *                           Helper functions                           *
-+ *                                                                      *
-  ************************************************************************/
- /**
-@@ -XXX,XX +XXX,XX @@ uri_free(URI *uri) {
-  *
-  * Returns 0 or an error code
-  */
--static int
--normalize_uri_path(char *path) {
-+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.
-      */
-     cur = path;
-     while (cur[0] == '/')
--      ++cur;
-+        ++cur;
-     if (cur[0] == '\0')
--      return(0);
-+        return (0);
-     /* Keep everything we've seen so far.  */
-     out = cur;
-@@ -XXX,XX +XXX,XX @@ normalize_uri_path(char *path) {
-      * Analyze each segment in sequence for cases (c) and (d).
-      */
-     while (cur[0] != '\0') {
--    /*
--     * c) All occurrences of "./", where "." is a complete path segment,
--     *    are removed from the buffer string.
--     */
--    if ((cur[0] == '.') && (cur[1] == '/')) {
--        cur += 2;
--        /* '//' normalization should be done at this point too */
--        while (cur[0] == '/')
--        cur++;
--        continue;
--    }
-+        /*
-+         * c) All occurrences of "./", where "." is a complete path segment,
-+         *    are removed from the buffer string.
-+         */
-+        if ((cur[0] == '.') && (cur[1] == '/')) {
-+            cur += 2;
-+            /* '//' normalization should be done at this point too */
-+            while (cur[0] == '/')
-+                cur++;
-+            continue;
-+        }
--    /*
--     * d) If the buffer string ends with "." as a complete path segment,
--     *    that "." is removed.
--     */
--    if ((cur[0] == '.') && (cur[1] == '\0'))
--        break;
-+        /*
-+         * d) If the buffer string ends with "." as a complete path segment,
-+         *    that "." is removed.
-+         */
-+        if ((cur[0] == '.') && (cur[1] == '\0'))
-+            break;
--    /* Otherwise keep the segment.  */
--    while (cur[0] != '/') {
-+        /* Otherwise keep the segment.  */
-+        while (cur[0] != '/') {
-             if (cur[0] == '\0')
--              goto done_cd;
--        (out++)[0] = (cur++)[0];
--    }
--    /* nomalize // */
--    while ((cur[0] == '/') && (cur[1] == '/'))
--        cur++;
-+                goto done_cd;
-+            (out++)[0] = (cur++)[0];
-+        }
-+        /* nomalize // */
-+        while ((cur[0] == '/') && (cur[1] == '/'))
-+            cur++;
-         (out++)[0] = (cur++)[0];
-     }
-- done_cd:
-+done_cd:
-     out[0] = '\0';
-     /* Reset to the beginning of the first segment for the next sequence.  */
-     cur = path;
-     while (cur[0] == '/')
--      ++cur;
-+        ++cur;
-     if (cur[0] == '\0')
--    return(0);
-+        return (0);
-     /*
-      * Analyze each segment in sequence for cases (e) and (f).
-@@ -XXX,XX +XXX,XX @@ normalize_uri_path(char *path) {
-         /* Find the end of the current segment.  */
-         segp = cur;
-         while ((segp[0] != '/') && (segp[0] != '\0'))
--          ++segp;
-+            ++segp;
-         /* If this is the last segment, we're done (we need at least two
-          * segments to meet the criteria for the (e) and (f) cases).
-          */
-         if (segp[0] == '\0')
--          break;
-+            break;
-         /* If the first segment is "..", or if the next segment _isn't_ "..",
-          * keep this segment and try the next one.
-          */
-         ++segp;
--        if (((cur[0] == '.') && (cur[1] == '.') && (segp == cur+3))
--            || ((segp[0] != '.') || (segp[1] != '.')
--                || ((segp[2] != '/') && (segp[2] != '\0')))) {
--          cur = segp;
--          continue;
-+        if (((cur[0] == '.') && (cur[1] == '.') && (segp == cur + 3)) ||
-+            ((segp[0] != '.') || (segp[1] != '.') ||
-+             ((segp[2] != '/') && (segp[2] != '\0')))) {
-+            cur = segp;
-+            continue;
-         }
-         /* If we get here, remove this segment and the next one and back up
-@@ -XXX,XX +XXX,XX @@ normalize_uri_path(char *path) {
-         /* If this is the end of the buffer, we're done.  */
-         if (segp[2] == '\0') {
--          cur[0] = '\0';
--          break;
-+            cur[0] = '\0';
-+            break;
-         }
-         /* Valgrind complained, strcpy(cur, segp + 3); */
-         /* string will overlap, do not use strcpy */
-         tmp = cur;
-         segp += 3;
-         while ((*tmp++ = *segp++) != 0)
--          ;
-+            ;
-         /* If there are no previous segments, then keep going from here.  */
-         segp = cur;
-         while ((segp > path) && ((--segp)[0] == '/'))
--          ;
-+            ;
-         if (segp == path)
--          continue;
-+            continue;
-         /* "segp" is pointing to the end of a previous segment; find it's
-          * start.  We need to back up to the previous segment and start
-@@ -XXX,XX +XXX,XX @@ normalize_uri_path(char *path) {
-          */
-         cur = segp;
-         while ((cur > path) && (cur[-1] != '/'))
--          --cur;
-+            --cur;
-     }
-     out[0] = '\0';
-@@ -XXX,XX +XXX,XX @@ normalize_uri_path(char *path) {
-      * We discard them from the final path.
-      */
-     if (path[0] == '/') {
--      cur = path;
--      while ((cur[0] == '/') && (cur[1] == '.') && (cur[2] == '.')
--             && ((cur[3] == '/') || (cur[3] == '\0')))
--    cur += 3;
-+        cur = path;
-+        while ((cur[0] == '/') && (cur[1] == '.') && (cur[2] == '.') &&
-+               ((cur[3] == '/') || (cur[3] == '\0')))
-+            cur += 3;
--      if (cur != path) {
--    out = path;
--    while (cur[0] != '\0')
--          (out++)[0] = (cur++)[0];
--    out[0] = 0;
--      }
-+        if (cur != path) {
-+            out = path;
-+            while (cur[0] != '\0')
-+                (out++)[0] = (cur++)[0];
-+            out[0] = 0;
-+        }
-     }
--    return(0);
-+    return (0);
- }
--static int is_hex(char c) {
--    if (((c >= '0') && (c <= '9')) ||
--        ((c >= 'a') && (c <= 'f')) ||
-+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);
- }
--
- /**
-  * uri_string_unescape:
-  * @str:  the string to unescape
-@@ -XXX,XX +XXX,XX @@ static int is_hex(char c) {
-  * Returns a copy of the string, but unescaped, will return NULL only in case
-  * of error
-  */
--char *
--uri_string_unescape(const char *str, int len, char *target) {
-+char *uri_string_unescape(const char *str, int len, char *target)
-+{
-     char *ret, *out;
-     const char *in;
-     if (str == NULL)
--    return(NULL);
--    if (len <= 0) len = strlen(str);
--    if (len < 0) return(NULL);
-+        return (NULL);
-+    if (len <= 0)
-+        len = strlen(str);
-+    if (len < 0)
-+        return (NULL);
-     if (target == NULL) {
--    ret = g_malloc(len + 1);
-+        ret = g_malloc(len + 1);
-     } else
--    ret = target;
-+        ret = target;
-     in = str;
-     out = ret;
--    while(len > 0) {
--    if ((len > 2) && (*in == '%') && (is_hex(in[1])) && (is_hex(in[2]))) {
--        in++;
--        if ((*in >= '0') && (*in <= '9'))
--            *out = (*in - '0');
--        else if ((*in >= 'a') && (*in <= 'f'))
--            *out = (*in - 'a') + 10;
--        else if ((*in >= 'A') && (*in <= 'F'))
--            *out = (*in - 'A') + 10;
--        in++;
--        if ((*in >= '0') && (*in <= '9'))
--            *out = *out * 16 + (*in - '0');
--        else if ((*in >= 'a') && (*in <= 'f'))
--            *out = *out * 16 + (*in - 'a') + 10;
--        else if ((*in >= 'A') && (*in <= 'F'))
--            *out = *out * 16 + (*in - 'A') + 10;
--        in++;
--        len -= 3;
--        out++;
--    } else {
--        *out++ = *in++;
--        len--;
--    }
-+    while (len > 0) {
-+        if ((len > 2) && (*in == '%') && (is_hex(in[1])) && (is_hex(in[2]))) {
-+            in++;
-+            if ((*in >= '0') && (*in <= '9'))
-+                *out = (*in - '0');
-+            else if ((*in >= 'a') && (*in <= 'f'))
-+                *out = (*in - 'a') + 10;
-+            else if ((*in >= 'A') && (*in <= 'F'))
-+                *out = (*in - 'A') + 10;
-+            in++;
-+            if ((*in >= '0') && (*in <= '9'))
-+                *out = *out * 16 + (*in - '0');
-+            else if ((*in >= 'a') && (*in <= 'f'))
-+                *out = *out * 16 + (*in - 'a') + 10;
-+            else if ((*in >= 'A') && (*in <= 'F'))
-+                *out = *out * 16 + (*in - 'A') + 10;
-+            in++;
-+            len -= 3;
-+            out++;
-+        } else {
-+            *out++ = *in++;
-+            len--;
-+        }
-     }
-     *out = 0;
--    return(ret);
-+    return (ret);
- }
- /**
-@@ -XXX,XX +XXX,XX @@ uri_string_unescape(const char *str, int len, char *target) {
-  *
-  * Returns a new escaped string or NULL in case of error.
-  */
--char *
--uri_string_escape(const char *str, const char *list) {
-+char *uri_string_escape(const char *str, const char *list)
-+{
-     char *ret, ch;
-     char *temp;
-     const char *in;
-     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);
-+    if (!(len > 0))
-+        return (NULL);
-     len += 20;
-     ret = g_malloc(len);
-     in = str;
-     out = 0;
--    while(*in != 0) {
--    if (len - out <= 3) {
-+    while (*in != 0) {
-+        if (len - out <= 3) {
-             temp = realloc2n(ret, &len);
--        ret = temp;
--    }
-+            ret = temp;
-+        }
--    ch = *in;
--
--    if ((ch != '@') && (!IS_UNRESERVED(ch)) && (!strchr(list, ch))) {
--        unsigned char val;
--        ret[out++] = '%';
--        val = ch >> 4;
--        if (val <= 9)
--        ret[out++] = '0' + val;
--        else
--        ret[out++] = 'A' + val - 0xA;
--        val = ch & 0xF;
--        if (val <= 9)
--        ret[out++] = '0' + val;
--        else
--        ret[out++] = 'A' + val - 0xA;
--        in++;
--    } else {
--        ret[out++] = *in++;
--    }
-+        ch = *in;
-+        if ((ch != '@') && (!IS_UNRESERVED(ch)) && (!strchr(list, ch))) {
-+            unsigned char val;
-+            ret[out++] = '%';
-+            val = ch >> 4;
-+            if (val <= 9)
-+                ret[out++] = '0' + val;
-+            else
-+                ret[out++] = 'A' + val - 0xA;
-+            val = ch & 0xF;
-+            if (val <= 9)
-+                ret[out++] = '0' + val;
-+            else
-+                ret[out++] = 'A' + val - 0xA;
-+            in++;
-+        } else {
-+            ret[out++] = *in++;
-+        }
-     }
-     ret[out] = 0;
--    return(ret);
-+    return (ret);
- }
- /************************************************************************
-- *                                    *
-- *            Public functions                *
-- *                                    *
-+ *                                                                      *
-+ *                           Public functions                           *
-+ *                                                                      *
-  ************************************************************************/
- /**
-@@ -XXX,XX +XXX,XX @@ uri_string_escape(const char *str, const char *list) {
-  * Returns a new URI string (to be freed by the caller) or NULL in case
-  *         of error.
-  */
--char *
--uri_resolve(const char *uri, const char *base) {
-+char *uri_resolve(const char *uri, const char *base)
-+{
-     char *val = NULL;
-     int ret, len, indx, cur, out;
-     URI *ref = NULL;
-@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
-      *    URI.  Should we do that here?
-      */
-     if (uri == NULL)
--    ret = -1;
-+        ret = -1;
-     else {
--    if (*uri) {
--        ref = uri_new();
--        ret = uri_parse_into(ref, uri);
--    }
--    else
--        ret = 0;
-+        if (*uri) {
-+            ref = uri_new();
-+            ret = uri_parse_into(ref, uri);
-+        } else
-+            ret = 0;
-     }
-     if (ret != 0)
--    goto done;
-+        goto done;
-     if ((ref != NULL) && (ref->scheme != NULL)) {
--    /*
--     * The URI is absolute don't modify.
--     */
--    val = g_strdup(uri);
--    goto done;
-+        /*
-+         * The URI is absolute don't modify.
-+         */
-+        val = g_strdup(uri);
-+        goto done;
-     }
-     if (base == NULL)
--    ret = -1;
-+        ret = -1;
-     else {
--    bas = uri_new();
--    ret = uri_parse_into(bas, base);
-+        bas = uri_new();
-+        ret = uri_parse_into(bas, base);
-     }
-     if (ret != 0) {
--    if (ref)
--        val = uri_to_string(ref);
--    goto done;
-+        if (ref)
-+            val = uri_to_string(ref);
-+        goto done;
-     }
-     if (ref == NULL) {
--    /*
--     * the base fragment must be ignored
--     */
-+        /*
-+         * the base fragment must be ignored
-+         */
-         g_free(bas->fragment);
-         bas->fragment = NULL;
--    val = uri_to_string(bas);
--    goto done;
-+        val = uri_to_string(bas);
-+        goto done;
-     }
-     /*
-@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
-      */
-     res = uri_new();
-     if ((ref->scheme == NULL) && (ref->path == NULL) &&
--    ((ref->authority == NULL) && (ref->server == NULL))) {
-+        ((ref->authority == NULL) && (ref->server == NULL))) {
-         res->scheme = g_strdup(bas->scheme);
--    if (bas->authority != NULL)
--        res->authority = g_strdup(bas->authority);
--    else if (bas->server != NULL) {
-+        if (bas->authority != NULL)
-+            res->authority = g_strdup(bas->authority);
-+        else if (bas->server != NULL) {
-             res->server = g_strdup(bas->server);
-             res->user = g_strdup(bas->user);
-             res->port = bas->port;
--    }
-+        }
-         res->path = g_strdup(bas->path);
-         if (ref->query != NULL) {
--        res->query = g_strdup (ref->query);
-+            res->query = g_strdup(ref->query);
-         } else {
-             res->query = g_strdup(bas->query);
-         }
-         res->fragment = g_strdup(ref->fragment);
--    goto step_7;
-+        goto step_7;
-     }
-     /*
-@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
-      *    scheme is inherited from the base URI's scheme component.
-      */
-     if (ref->scheme != NULL) {
--    val = uri_to_string(ref);
--    goto done;
-+        val = uri_to_string(ref);
-+        goto done;
-     }
-     res->scheme = g_strdup(bas->scheme);
-@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
-      *    use an authority component.
-      */
-     if ((ref->authority != NULL) || (ref->server != NULL)) {
--    if (ref->authority != NULL)
--        res->authority = g_strdup(ref->authority);
--    else {
--        res->server = g_strdup(ref->server);
-+        if (ref->authority != NULL)
-+            res->authority = g_strdup(ref->authority);
-+        else {
-+            res->server = g_strdup(ref->server);
-             res->user = g_strdup(ref->user);
-             res->port = ref->port;
--    }
-+        }
-         res->path = g_strdup(ref->path);
--    goto step_7;
-+        goto step_7;
-     }
-     if (bas->authority != NULL)
--    res->authority = g_strdup(bas->authority);
-+        res->authority = g_strdup(bas->authority);
-     else if (bas->server != NULL) {
-         res->server = g_strdup(bas->server);
-         res->user = g_strdup(bas->user);
--    res->port = bas->port;
-+        res->port = bas->port;
-     }
-     /*
-@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
-      *    the reference is an absolute-path and we skip to step 7.
-      */
-     if ((ref->path != NULL) && (ref->path[0] == '/')) {
--    res->path = g_strdup(ref->path);
--    goto step_7;
-+        res->path = g_strdup(ref->path);
-+        goto step_7;
-     }
--
-     /*
-      * 6) If this step is reached, then we are resolving a relative-path
-      *    reference.  The relative path needs to be merged with the base
-@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
-      */
-     len = 2; /* extra / and 0 */
-     if (ref->path != NULL)
--    len += strlen(ref->path);
-+        len += strlen(ref->path);
-     if (bas->path != NULL)
--    len += strlen(bas->path);
-+        len += strlen(bas->path);
-     res->path = g_malloc(len);
-     res->path[0] = 0;
-@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
-     cur = 0;
-     out = 0;
-     if (bas->path != NULL) {
--    while (bas->path[cur] != 0) {
--        while ((bas->path[cur] != 0) && (bas->path[cur] != '/'))
--        cur++;
--        if (bas->path[cur] == 0)
--        break;
-+        while (bas->path[cur] != 0) {
-+            while ((bas->path[cur] != 0) && (bas->path[cur] != '/'))
-+                cur++;
-+            if (bas->path[cur] == 0)
-+                break;
--        cur++;
--        while (out < cur) {
--        res->path[out] = bas->path[out];
--        out++;
--        }
--    }
-+            cur++;
-+            while (out < cur) {
-+                res->path[out] = bas->path[out];
-+                out++;
-+            }
-+        }
-     }
-     res->path[out] = 0;
-@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
-      *    string.
-      */
-     if (ref->path != NULL && ref->path[0] != 0) {
--    indx = 0;
--    /*
--     * Ensure the path includes a '/'
--     */
--    if ((out == 0) && (bas->server != NULL))
--        res->path[out++] = '/';
--    while (ref->path[indx] != 0) {
--        res->path[out++] = ref->path[indx++];
--    }
-+        indx = 0;
-+        /*
-+         * Ensure the path includes a '/'
-+         */
-+        if ((out == 0) && (bas->server != NULL))
-+            res->path[out++] = '/';
-+        while (ref->path[indx] != 0) {
-+            res->path[out++] = ref->path[indx++];
-+        }
-     }
-     res->path[out] = 0;
-@@ -XXX,XX +XXX,XX @@ step_7:
- done:
-     if (ref != NULL)
--    uri_free(ref);
-+        uri_free(ref);
-     if (bas != NULL)
--    uri_free(bas);
-+        uri_free(bas);
-     if (res != NULL)
--    uri_free(res);
--    return(val);
-+        uri_free(res);
-+    return (val);
- }
- /**
-@@ -XXX,XX +XXX,XX @@ done:
-  * Returns a new URI string (to be freed by the caller) or NULL in case
-  * error.
-  */
--char *
--uri_resolve_relative (const char *uri, const char * base)
-+char *uri_resolve_relative(const char *uri, const char *base)
- {
-     char *val = NULL;
-     int ret;
-@@ -XXX,XX +XXX,XX @@ uri_resolve_relative (const char *uri, const char * base)
-     int remove_path = 0;
-     if ((uri == NULL) || (*uri == 0))
--    return NULL;
-+        return NULL;
-     /*
-      * First parse URI into a standard form
-      */
--    ref = uri_new ();
-+    ref = uri_new();
-     /* If URI not already in "relative" form */
-     if (uri[0] != '.') {
--    ret = uri_parse_into (ref, uri);
--    if (ret != 0)
--        goto done;        /* Error in URI, return NULL */
-+        ret = uri_parse_into(ref, uri);
-+        if (ret != 0)
-+            goto done; /* Error in URI, return NULL */
-     } else
--    ref->path = g_strdup(uri);
-+        ref->path = g_strdup(uri);
-     /*
-      * Next parse base into the same standard form
-      */
-     if ((base == NULL) || (*base == 0)) {
--    val = g_strdup (uri);
--    goto done;
-+        val = g_strdup(uri);
-+        goto done;
-     }
--    bas = uri_new ();
-+    bas = uri_new();
-     if (base[0] != '.') {
--    ret = uri_parse_into (bas, base);
--    if (ret != 0)
--        goto done;        /* Error in base, return NULL */
-+        ret = uri_parse_into(bas, base);
-+        if (ret != 0)
-+            goto done; /* Error in base, return NULL */
-     } else
--    bas->path = g_strdup(base);
-+        bas->path = g_strdup(base);
-     /*
-      * If the scheme / server on the URI differs from the base,
-      * just return the URI
-      */
-     if ((ref->scheme != NULL) &&
--    ((bas->scheme == NULL) ||
--     (strcmp (bas->scheme, ref->scheme)) ||
--     (strcmp (bas->server, ref->server)))) {
--    val = g_strdup (uri);
--    goto done;
-+        ((bas->scheme == NULL) || (strcmp(bas->scheme, ref->scheme)) ||
-+         (strcmp(bas->server, ref->server)))) {
-+        val = g_strdup(uri);
-+        goto done;
-     }
-     if (bas->path == ref->path ||
-         (bas->path && ref->path && !strcmp(bas->path, ref->path))) {
--    val = g_strdup("");
--    goto done;
-+        val = g_strdup("");
-+        goto done;
-     }
-     if (bas->path == NULL) {
--    val = g_strdup(ref->path);
--    goto done;
-+        val = g_strdup(ref->path);
-+        goto done;
-     }
-     if (ref->path == NULL) {
--        ref->path = (char *) "/";
--    remove_path = 1;
-+        ref->path = (char *)"/";
-+        remove_path = 1;
-     }
-     /*
-@@ -XXX,XX +XXX,XX @@ uri_resolve_relative (const char *uri, const char * base)
-      * two path components may be missing (bug 316224)
-      */
-     if (bas->path == NULL) {
--    if (ref->path != NULL) {
--        uptr = ref->path;
--        if (*uptr == '/')
--        uptr++;
--        /* exception characters from uri_to_string */
--        val = uri_string_escape(uptr, "/;&=+$,");
--    }
--    goto done;
-+        if (ref->path != NULL) {
-+            uptr = ref->path;
-+            if (*uptr == '/')
-+                uptr++;
-+            /* exception characters from uri_to_string */
-+            val = uri_string_escape(uptr, "/;&=+$,");
-+        }
-+        goto done;
-     }
-     bptr = bas->path;
-     if (ref->path == NULL) {
--    for (ix = 0; bptr[ix] != 0; ix++) {
--        if (bptr[ix] == '/')
--        nbslash++;
--    }
--    uptr = NULL;
--    len = 1;    /* this is for a string terminator only */
-+        for (ix = 0; bptr[ix] != 0; ix++) {
-+            if (bptr[ix] == '/')
-+                nbslash++;
-+        }
-+        uptr = NULL;
-+        len = 1; /* this is for a string terminator only */
-     } else {
--    /*
--     * Next we compare the two strings and find where they first differ
--     */
--    if ((ref->path[pos] == '.') && (ref->path[pos+1] == '/'))
-+        /*
-+         * Next we compare the two strings and find where they first differ
-+         */
-+        if ((ref->path[pos] == '.') && (ref->path[pos + 1] == '/'))
-             pos += 2;
--    if ((*bptr == '.') && (bptr[1] == '/'))
-+        if ((*bptr == '.') && (bptr[1] == '/'))
-             bptr += 2;
--    else if ((*bptr == '/') && (ref->path[pos] != '/'))
--        bptr++;
--    while ((bptr[pos] == ref->path[pos]) && (bptr[pos] != 0))
--        pos++;
-+        else if ((*bptr == '/') && (ref->path[pos] != '/'))
-+            bptr++;
-+        while ((bptr[pos] == ref->path[pos]) && (bptr[pos] != 0))
-+            pos++;
--    if (bptr[pos] == ref->path[pos]) {
--        val = g_strdup("");
--        goto done;        /* (I can't imagine why anyone would do this) */
--    }
-+        if (bptr[pos] == ref->path[pos]) {
-+            val = g_strdup("");
-+            goto done; /* (I can't imagine why anyone would do this) */
-+        }
--    /*
--     * In URI, "back up" to the last '/' encountered.  This will be the
--     * beginning of the "unique" suffix of URI
--     */
--    ix = pos;
--    if ((ref->path[ix] == '/') && (ix > 0))
--        ix--;
--    else if ((ref->path[ix] == 0) && (ix > 1) && (ref->path[ix - 1] == '/'))
--        ix -= 2;
--    for (; ix > 0; ix--) {
--        if (ref->path[ix] == '/')
--        break;
--    }
--    if (ix == 0) {
--        uptr = ref->path;
--    } else {
--        ix++;
--        uptr = &ref->path[ix];
--    }
-+        /*
-+         * In URI, "back up" to the last '/' encountered.  This will be the
-+         * beginning of the "unique" suffix of URI
-+         */
-+        ix = pos;
-+        if ((ref->path[ix] == '/') && (ix > 0))
-+            ix--;
-+        else if ((ref->path[ix] == 0) && (ix > 1) && (ref->path[ix - 1] == '/'))
-+            ix -= 2;
-+        for (; ix > 0; ix--) {
-+            if (ref->path[ix] == '/')
-+                break;
-+        }
-+        if (ix == 0) {
-+            uptr = ref->path;
-+        } else {
-+            ix++;
-+            uptr = &ref->path[ix];
-+        }
--    /*
--     * In base, count the number of '/' from the differing point
--     */
--    if (bptr[pos] != ref->path[pos]) {/* check for trivial URI == base */
--        for (; bptr[ix] != 0; ix++) {
--        if (bptr[ix] == '/')
--            nbslash++;
--        }
--    }
--    len = strlen (uptr) + 1;
-+        /*
-+         * In base, count the number of '/' from the differing point
-+         */
-+        if (bptr[pos] != ref->path[pos]) { /* check for trivial URI == base */
-+            for (; bptr[ix] != 0; ix++) {
-+                if (bptr[ix] == '/')
-+                    nbslash++;
-+            }
-+        }
-+        len = strlen(uptr) + 1;
-     }
-     if (nbslash == 0) {
--    if (uptr != NULL)
--        /* exception characters from uri_to_string */
--        val = uri_string_escape(uptr, "/;&=+$,");
--    goto done;
-+        if (uptr != NULL)
-+            /* exception characters from uri_to_string */
-+            val = uri_string_escape(uptr, "/;&=+$,");
-+        goto done;
-     }
-     /*
-@@ -XXX,XX +XXX,XX @@ uri_resolve_relative (const char *uri, const char * base)
-      * length of the remainder of the URI, plus enough space
-      * for the "../" groups, plus one for the terminator
-      */
--    val = g_malloc (len + 3 * nbslash);
-+    val = g_malloc(len + 3 * nbslash);
-     vptr = val;
-     /*
-      * Put in as many "../" as needed
-      */
--    for (; nbslash>0; nbslash--) {
--    *vptr++ = '.';
--    *vptr++ = '.';
--    *vptr++ = '/';
-+    for (; nbslash > 0; nbslash--) {
-+        *vptr++ = '.';
-+        *vptr++ = '.';
-+        *vptr++ = '/';
-     }
-     /*
-      * Finish up with the end of the URI
-      */
-     if (uptr != NULL) {
--        if ((vptr > val) && (len > 0) &&
--        (uptr[0] == '/') && (vptr[-1] == '/')) {
--        memcpy (vptr, uptr + 1, len - 1);
--        vptr[len - 2] = 0;
--    } else {
--        memcpy (vptr, uptr, len);
--        vptr[len - 1] = 0;
--    }
-+        if ((vptr > val) && (len > 0) && (uptr[0] == '/') &&
-+            (vptr[-1] == '/')) {
-+            memcpy(vptr, uptr + 1, len - 1);
-+            vptr[len - 2] = 0;
-+        } else {
-+            memcpy(vptr, uptr, len);
-+            vptr[len - 1] = 0;
-+        }
-     } else {
--    vptr[len - 1] = 0;
-+        vptr[len - 1] = 0;
-     }
-     /* escape the freshly-built path */
-     vptr = val;
--    /* exception characters from uri_to_string */
-+    /* exception characters from uri_to_string */
-     val = uri_string_escape(vptr, "/;&=+$,");
-     g_free(vptr);
-@@ -XXX,XX +XXX,XX @@ done:
-     if (remove_path != 0)
-         ref->path = NULL;
-     if (ref != NULL)
--    uri_free (ref);
-+        uri_free(ref);
-     if (bas != NULL)
--    uri_free (bas);
-+        uri_free(bas);
-     return val;
- }
-@@ -XXX,XX +XXX,XX @@ done:
-  * Utility functions to help parse and assemble query strings.
-  */
--struct QueryParams *
--query_params_new (int init_alloc)
-+struct QueryParams *query_params_new(int init_alloc)
- {
-     struct QueryParams *ps;
--    if (init_alloc <= 0) init_alloc = 1;
-+    if (init_alloc <= 0)
-+        init_alloc = 1;
-     ps = g_new(QueryParams, 1);
-     ps->n = 0;
-@@ -XXX,XX +XXX,XX @@ query_params_new (int init_alloc)
- /* Ensure there is space to store at least one more parameter
-  * at the end of the set.
-  */
--static int
--query_params_append (struct QueryParams *ps,
--               const char *name, const char *value)
-+static int query_params_append(struct QueryParams *ps, const char *name,
-+                               const char *value)
- {
-     if (ps->n >= ps->alloc) {
-         ps->p = g_renew(QueryParam, ps->p, ps->alloc * 2);
-@@ -XXX,XX +XXX,XX @@ query_params_append (struct QueryParams *ps,
-     return 0;
- }
--void
--query_params_free (struct QueryParams *ps)
-+void query_params_free(struct QueryParams *ps)
- {
-     int i;
-     for (i = 0; i < ps->n; ++i) {
--        g_free (ps->p[i].name);
--        g_free (ps->p[i].value);
-+        g_free(ps->p[i].name);
-+        g_free(ps->p[i].value);
-     }
--    g_free (ps->p);
--    g_free (ps);
-+    g_free(ps->p);
-+    g_free(ps);
- }
--struct QueryParams *
--query_params_parse (const char *query)
-+struct QueryParams *query_params_parse(const char *query)
- {
-     struct QueryParams *ps;
-     const char *end, *eq;
--    ps = query_params_new (0);
--    if (!query || query[0] == '\0') return ps;
-+    ps = query_params_new(0);
-+    if (!query || query[0] == '\0')
-+        return ps;
-     while (*query) {
-         char *name = NULL, *value = NULL;
-         /* Find the next separator, or end of the string. */
--        end = strchr (query, '&');
-+        end = strchr(query, '&');
-         if (!end)
--            end = strchr (query, ';');
-+            end = strchr(query, ';');
-         if (!end)
--            end = query + strlen (query);
-+            end = query + strlen(query);
-         /* Find the first '=' character between here and end. */
--        eq = strchr (query, '=');
--        if (eq && eq >= end) eq = NULL;
-+        eq = strchr(query, '=');
-+        if (eq && eq >= end)
-+            eq = NULL;
-         /* Empty section (eg. "&&"). */
-         if (end == query)
-@@ -XXX,XX +XXX,XX @@ query_params_parse (const char *query)
-          * and consistent with CGI.pm we assume value is "".
-          */
-         else if (!eq) {
--            name = uri_string_unescape (query, end - query, NULL);
-+            name = uri_string_unescape(query, end - query, NULL);
-             value = NULL;
-         }
-         /* Or if we have "name=" here (works around annoying
-          * problem when calling uri_string_unescape with len = 0).
-          */
--        else if (eq+1 == end) {
--            name = uri_string_unescape (query, eq - query, NULL);
-+        else if (eq + 1 == end) {
-+            name = uri_string_unescape(query, eq - query, NULL);
-             value = g_new0(char, 1);
-         }
-         /* If the '=' character is at the beginning then we have
-@@ -XXX,XX +XXX,XX @@ query_params_parse (const char *query)
-         /* Otherwise it's "name=value". */
-         else {
--            name = uri_string_unescape (query, eq - query, NULL);
--            value = uri_string_unescape (eq+1, end - (eq+1), NULL);
-+            name = uri_string_unescape(query, eq - query, NULL);
-+            value = uri_string_unescape(eq + 1, end - (eq + 1), NULL);
-         }
-         /* Append to the parameter set. */
--        query_params_append (ps, name, value);
-+        query_params_append(ps, name, value);
-         g_free(name);
-         g_free(value);
-     next:
-         query = end;
--        if (*query) query ++; /* skip '&' separator */
-+        if (*query)
-+            query++; /* skip '&' separator */
-     }
-     return ps;
 --
-.14.3
+.31.1

-[Qemu-devel] [PULL 2/6] util/uri.c: remove brackets that wrap `return` statement's content.
+[PULL 5/8] coroutine-sleep: allow qemu_co_sleep_wake that wakes nothing
-From: Su Hang <suhang16@mails.ucas.ac.cn>
+From: Paolo Bonzini <pbonzini@redhat.com>
-only remove brackets that wrap `return` statements' content.
+All callers of qemu_co_sleep_wake are checking whether they are passing
 a NULL argument inside the pointer-to-pointer: do the check in
 qemu_co_sleep_wake itself.
-use `perl -pi -e "s/return \((.*?)\);/return \1;/g" util/uri.c`
+As a side effect, qemu_co_sleep_wake can be called more than once and
-to remove pattern like this: "return (1);"
+it will only wake the coroutine once; after the first time, the argument
 will be set to NULL via *sleep_state->user_state_pointer.  However, this
 would not be safe unless co_sleep_cb keeps using the QemuCoSleepState*
 directly, so make it go through the pointer-to-pointer instead.
-Signed-off-by: Su Hang <suhang16@mails.ucas.ac.cn>
+Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Message-id: 1519533358-13759-3-git-send-email-suhang16@mails.ucas.ac.cn
+Message-id: 20210517100548.28806-4-pbonzini@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- util/uri.c | 160 ++++++++++++++++++++++++++++++-------------------------------
+ block/block-copy.c          |  4 +---
-file changed, 80 insertions(+), 80 deletions(-)
+ block/nbd.c                 |  8 ++------
  util/qemu-coroutine-sleep.c | 21 ++++++++++++---------
 files changed, 15 insertions(+), 18 deletions(-)
-diff --git a/util/uri.c b/util/uri.c
+diff --git a/block/block-copy.c b/block/block-copy.c
 index XXXXXXX..XXXXXXX 100644
---- a/util/uri.c
+--- a/block/block-copy.c
-+++ b/util/uri.c
++++ b/block/block-copy.c
-@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_scheme(URI *uri, const char **str)
+@@ -XXX,XX +XXX,XX @@ out:
-     const char *cur;
+ void block_copy_kick(BlockCopyCallState *call_state)
-     if (str == NULL)
+ {
--        return (-1);
+-    if (call_state->sleep_state) {
-+        return -1;
+-        qemu_co_sleep_wake(call_state->sleep_state);
+-    }
-     cur = *str;
++    qemu_co_sleep_wake(call_state->sleep_state);
-     if (!ISA_ALPHA(cur))
+ }
--        return (2);
-+        return 2;
+ /*
-     cur++;
+diff --git a/block/nbd.c b/block/nbd.c
-     while (ISA_ALPHA(cur) || ISA_DIGIT(cur) || (*cur == '+') || (*cur == '-') ||
+index XXXXXXX..XXXXXXX 100644
-            (*cur == '.'))
+--- a/block/nbd.c
-@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_scheme(URI *uri, const char **str)
++++ b/block/nbd.c
-         uri->scheme = g_strndup(*str, cur - *str);
+@@ -XXX,XX +XXX,XX @@ static void coroutine_fn nbd_client_co_drain_begin(BlockDriverState *bs)
      BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
      s->drained = true;
 -    if (s->connection_co_sleep_ns_state) {
 -        qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
 -    }
 +    qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
      nbd_co_establish_connection_cancel(bs, false);
@@ -XXX,XX +XXX,XX @@ static void nbd_teardown_connection(BlockDriverState *bs)
      s->state = NBD_CLIENT_QUIT;
      if (s->connection_co) {
 -        if (s->connection_co_sleep_ns_state) {
 -            qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
 -        }
 +        qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
          nbd_co_establish_connection_cancel(bs, true);
      }
-     *str = cur;
+     if (qemu_in_coroutine()) {
--    return (0);
+diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
-+    return 0;
+index XXXXXXX..XXXXXXX 100644
 --- a/util/qemu-coroutine-sleep.c
 +++ b/util/qemu-coroutine-sleep.c
@@ -XXX,XX +XXX,XX @@ struct QemuCoSleepState {
  void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
  {
 -    /* Write of schedule protected by barrier write in aio_co_schedule */
 -    const char *scheduled = qatomic_cmpxchg(&sleep_state->co->scheduled,
 -                                           qemu_co_sleep_ns__scheduled, NULL);
 +    if (sleep_state) {
 +        /* Write of schedule protected by barrier write in aio_co_schedule */
 +        const char *scheduled = qatomic_cmpxchg(&sleep_state->co->scheduled,
 +                                                qemu_co_sleep_ns__scheduled, NULL);
 -    assert(scheduled == qemu_co_sleep_ns__scheduled);
 -    *sleep_state->user_state_pointer = NULL;
 -    timer_del(&sleep_state->ts);
 -    aio_co_wake(sleep_state->co);
 +        assert(scheduled == qemu_co_sleep_ns__scheduled);
 +        *sleep_state->user_state_pointer = NULL;
 +        timer_del(&sleep_state->ts);
 +        aio_co_wake(sleep_state->co);
 +    }
  }
- /**
+ static void co_sleep_cb(void *opaque)
-@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_fragment(URI *uri, const char **str)
+ {
-     const char *cur;
+-    qemu_co_sleep_wake(opaque);
++    QemuCoSleepState **sleep_state = opaque;
-     if (str == NULL)
++    qemu_co_sleep_wake(*sleep_state);
--        return (-1);
+ }
-+        return -1;
+ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
-     cur = *str;
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
+         abort();
@@ -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);
+-    aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, &state);
-+    return 0;
++    aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, sleep_state);
- }
+     *sleep_state = &state;
+     timer_mod(&state.ts, qemu_clock_get_ns(type) + ns);
- /**
+     qemu_coroutine_yield();
@@ -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;
  }
  /**
 --
-.14.3
+.31.1

-[Qemu-devel] [PULL 5/6] Add a git-publish configuration file
+[PULL 6/8] coroutine-sleep: move timer out of QemuCoSleepState
-From: Fam Zheng <famz@redhat.com>
+From: Paolo Bonzini <pbonzini@redhat.com>
-git-publish [1] is a convenient tool to send patches and has been
+This simplification is enabled by the previous patch.  Now aio_co_wake
-popular among QEMU developers.  Recently it has been made available in
+will only be called once, therefore we do not care about a spurious
-Fedora/Debian official repo.
+firing of the timer after a qemu_co_sleep_wake.
-One nice feature of the tool is a per-project configuration with
+Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-profiles, especially in which the cccmd option is a handy method to
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-create the Cc list.
+Message-id: 20210517100548.28806-5-pbonzini@redhat.com
 [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 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ util/qemu-coroutine-sleep.c | 8 ++++----
-file changed, 51 insertions(+)
+file changed, 4 insertions(+), 4 deletions(-)
  create mode 100644 .gitpublish
-diff --git a/.gitpublish b/.gitpublish
+diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
-new file mode 100644
+index XXXXXXX..XXXXXXX 100644
-index XXXXXXX..XXXXXXX
+--- a/util/qemu-coroutine-sleep.c
---- /dev/null
++++ b/util/qemu-coroutine-sleep.c
-+++ b/.gitpublish
+@@ -XXX,XX +XXX,XX @@ static const char *qemu_co_sleep_ns__scheduled = "qemu_co_sleep_ns";
-@@ -XXX,XX +XXX,XX @@
-+#
+ struct QemuCoSleepState {
-+# Common git-publish profiles that can be used to send patches to QEMU upstream.
+     Coroutine *co;
-+#
+-    QEMUTimer ts;
-+# See https://github.com/stefanha/git-publish for more information
+     QemuCoSleepState **user_state_pointer;
-+#
+ };
-+[gitpublishprofile "default"]
-+base = master
+@@ -XXX,XX +XXX,XX @@ void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
-+to = qemu-devel@nongnu.org
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
+         assert(scheduled == qemu_co_sleep_ns__scheduled);
-+
+         *sleep_state->user_state_pointer = NULL;
-+[gitpublishprofile "rfc"]
+-        timer_del(&sleep_state->ts);
-+base = master
+         aio_co_wake(sleep_state->co);
-+prefix = RFC PATCH
+     }
-+to = qemu-devel@nongnu.org
+ }
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
-+
+                                             QemuCoSleepState **sleep_state)
-+[gitpublishprofile "stable"]
+ {
-+base = master
+     AioContext *ctx = qemu_get_current_aio_context();
-+to = qemu-devel@nongnu.org
++    QEMUTimer ts;
-+cc = qemu-stable@nongnu.org
+     QemuCoSleepState state = {
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
+         .co = qemu_coroutine_self(),
-+
+         .user_state_pointer = sleep_state,
-+[gitpublishprofile "trivial"]
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
-+base = master
+         abort();
-+to = qemu-devel@nongnu.org
+     }
-+cc = qemu-trivial@nongnu.org
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
+-    aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, sleep_state);
-+
++    aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, sleep_state);
-+[gitpublishprofile "block"]
+     *sleep_state = &state;
-+base = master
+-    timer_mod(&state.ts, qemu_clock_get_ns(type) + ns);
-+to = qemu-devel@nongnu.org
++    timer_mod(&ts, qemu_clock_get_ns(type) + ns);
-+cc = qemu-block@nongnu.org
+     qemu_coroutine_yield();
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
++    timer_del(&ts);
-+
-+[gitpublishprofile "arm"]
+     /* qemu_co_sleep_wake clears *sleep_state before resuming this coroutine.  */
-+base = master
+     assert(*sleep_state == NULL);
 +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
 --
-.14.3
+.31.1

-[Qemu-devel] [PULL 4/6] tests/libqos: Check for valid dev pointer when looking for PCI devices
+[PULL 7/8] coroutine-sleep: replace QemuCoSleepState pointer with struct in the API
-From: Thomas Huth <thuth@redhat.com>
+From: Paolo Bonzini <pbonzini@redhat.com>
-dev could be NULL if the PCI device can not be found due to some
+Right now, users of qemu_co_sleep_ns_wakeable are simply passing
-reasons, so we must not dereference the pointer in this case.
+a pointer to QemuCoSleepState by reference to the function.  But
+QemuCoSleepState really is just a Coroutine*; making the
-Signed-off-by: Thomas Huth <thuth@redhat.com>
+content of the struct public is just as efficient and lets us
-Message-id: 1519713884-2346-1-git-send-email-thuth@redhat.com
+skip the user_state_pointer indirection.
 Since the usage is changed, take the occasion to rename the
 struct to QemuCoSleep.
 Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Message-id: 20210517100548.28806-6-pbonzini@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- tests/libqos/virtio-pci.c | 4 +++-
+ include/qemu/coroutine.h    | 23 +++++++++++----------
-file changed, 3 insertions(+), 1 deletion(-)
+ block/block-copy.c          |  8 ++++----
+ block/nbd.c                 | 10 ++++-----
-diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c
+ util/qemu-coroutine-sleep.c | 41 ++++++++++++++++---------------------
-index XXXXXXX..XXXXXXX 100644
+files changed, 39 insertions(+), 43 deletions(-)
---- a/tests/libqos/virtio-pci.c
-+++ b/tests/libqos/virtio-pci.c
+diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
-@@ -XXX,XX +XXX,XX @@ QVirtioPCIDevice *qvirtio_pci_device_find(QPCIBus *bus, uint16_t device_type)
+index XXXXXXX..XXXXXXX 100644
-     qvirtio_pci_foreach(bus, device_type, false, 0,
+--- a/include/qemu/coroutine.h
-                         qvirtio_pci_assign_device, &dev);
++++ b/include/qemu/coroutine.h
+@@ -XXX,XX +XXX,XX @@ void qemu_co_rwlock_wrlock(CoRwlock *lock);
--    dev->vdev.bus = &qvirtio_pci;
+  */
-+    if (dev) {
+ void qemu_co_rwlock_unlock(CoRwlock *lock);
-+        dev->vdev.bus = &qvirtio_pci;
-+    }
+-typedef struct QemuCoSleepState QemuCoSleepState;
++typedef struct QemuCoSleep {
-     return dev;
++    Coroutine *to_wake;
 +} QemuCoSleep;
  /**
 - * Yield the coroutine for a given duration. During this yield, @sleep_state
 - * is set to an opaque pointer, which may be used for
 - * qemu_co_sleep_wake(). Be careful, the pointer is set back to zero when the
 - * timer fires. Don't save the obtained value to other variables and don't call
 - * qemu_co_sleep_wake from another aio context.
 + * Yield the coroutine for a given duration. Initializes @w so that,
 + * during this yield, it can be passed to qemu_co_sleep_wake() to
 + * terminate the sleep.
   */
 -void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
 -                                            QemuCoSleepState **sleep_state);
 +void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
 +                                            QEMUClockType type, int64_t ns);
 +
  static inline void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns)
  {
 -    QemuCoSleepState *unused = NULL;
 -    qemu_co_sleep_ns_wakeable(type, ns, &unused);
 +    QemuCoSleep w = { 0 };
 +    qemu_co_sleep_ns_wakeable(&w, type, ns);
  }
  /**
@@ -XXX,XX +XXX,XX @@ static inline void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns)
   * qemu_co_sleep_ns() and should be checked to be non-NULL before calling
   * qemu_co_sleep_wake().
   */
 -void qemu_co_sleep_wake(QemuCoSleepState *sleep_state);
 +void qemu_co_sleep_wake(QemuCoSleep *w);
  /**
   * Yield until a file descriptor becomes readable
 diff --git a/block/block-copy.c b/block/block-copy.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/block-copy.c
 +++ b/block/block-copy.c
@@ -XXX,XX +XXX,XX @@ typedef struct BlockCopyCallState {
      /* State */
      int ret;
      bool finished;
 -    QemuCoSleepState *sleep_state;
 +    QemuCoSleep sleep;
      bool cancelled;
      /* OUT parameters */
@@ -XXX,XX +XXX,XX @@ block_copy_dirty_clusters(BlockCopyCallState *call_state)
                  if (ns > 0) {
                      block_copy_task_end(task, -EAGAIN);
                      g_free(task);
 -                    qemu_co_sleep_ns_wakeable(QEMU_CLOCK_REALTIME, ns,
 -                                              &call_state->sleep_state);
 +                    qemu_co_sleep_ns_wakeable(&call_state->sleep,
 +                                              QEMU_CLOCK_REALTIME, ns);
                      continue;
                  }
              }
@@ -XXX,XX +XXX,XX @@ out:
  void block_copy_kick(BlockCopyCallState *call_state)
  {
 -    qemu_co_sleep_wake(call_state->sleep_state);
 +    qemu_co_sleep_wake(&call_state->sleep);
  }
  /*
 diff --git a/block/nbd.c b/block/nbd.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/nbd.c
 +++ b/block/nbd.c
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVNBDState {
      CoQueue free_sema;
      Coroutine *connection_co;
      Coroutine *teardown_co;
 -    QemuCoSleepState *connection_co_sleep_ns_state;
 +    QemuCoSleep reconnect_sleep;
      bool drained;
      bool wait_drained_end;
      int in_flight;
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn nbd_client_co_drain_begin(BlockDriverState *bs)
      BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
      s->drained = true;
 -    qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
 +    qemu_co_sleep_wake(&s->reconnect_sleep);
      nbd_co_establish_connection_cancel(bs, false);
@@ -XXX,XX +XXX,XX @@ static void nbd_teardown_connection(BlockDriverState *bs)
      s->state = NBD_CLIENT_QUIT;
      if (s->connection_co) {
 -        qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
 +        qemu_co_sleep_wake(&s->reconnect_sleep);
          nbd_co_establish_connection_cancel(bs, true);
      }
      if (qemu_in_coroutine()) {
@@ -XXX,XX +XXX,XX @@ static coroutine_fn void nbd_co_reconnect_loop(BDRVNBDState *s)
              }
              bdrv_inc_in_flight(s->bs);
          } else {
 -            qemu_co_sleep_ns_wakeable(QEMU_CLOCK_REALTIME, timeout,
 -                                      &s->connection_co_sleep_ns_state);
 +            qemu_co_sleep_ns_wakeable(&s->reconnect_sleep,
 +                                      QEMU_CLOCK_REALTIME, timeout);
              if (s->drained) {
                  continue;
              }
 diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
 index XXXXXXX..XXXXXXX 100644
 --- a/util/qemu-coroutine-sleep.c
 +++ b/util/qemu-coroutine-sleep.c
@@ -XXX,XX +XXX,XX @@
  static const char *qemu_co_sleep_ns__scheduled = "qemu_co_sleep_ns";
 -struct QemuCoSleepState {
 +void qemu_co_sleep_wake(QemuCoSleep *w)
 +{
      Coroutine *co;
 -    QemuCoSleepState **user_state_pointer;
 -};
 -void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
 -{
 -    if (sleep_state) {
 +    co = w->to_wake;
 +    w->to_wake = NULL;
 +    if (co) {
          /* Write of schedule protected by barrier write in aio_co_schedule */
 -        const char *scheduled = qatomic_cmpxchg(&sleep_state->co->scheduled,
 +        const char *scheduled = qatomic_cmpxchg(&co->scheduled,
                                                  qemu_co_sleep_ns__scheduled, NULL);
          assert(scheduled == qemu_co_sleep_ns__scheduled);
 -        *sleep_state->user_state_pointer = NULL;
 -        aio_co_wake(sleep_state->co);
 +        aio_co_wake(co);
      }
  }
  static void co_sleep_cb(void *opaque)
  {
 -    QemuCoSleepState **sleep_state = opaque;
 -    qemu_co_sleep_wake(*sleep_state);
 +    QemuCoSleep *w = opaque;
 +    qemu_co_sleep_wake(w);
  }
 -void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
 -                                            QemuCoSleepState **sleep_state)
 +void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
 +                                            QEMUClockType type, int64_t ns)
  {
 +    Coroutine *co = qemu_coroutine_self();
      AioContext *ctx = qemu_get_current_aio_context();
      QEMUTimer ts;
 -    QemuCoSleepState state = {
 -        .co = qemu_coroutine_self(),
 -        .user_state_pointer = sleep_state,
 -    };
 -    const char *scheduled = qatomic_cmpxchg(&state.co->scheduled, NULL,
 -                                           qemu_co_sleep_ns__scheduled);
 +    const char *scheduled = qatomic_cmpxchg(&co->scheduled, NULL,
 +                                            qemu_co_sleep_ns__scheduled);
      if (scheduled) {
          fprintf(stderr,
                  "%s: Co-routine was already scheduled in '%s'\n",
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
          abort();
      }
 -    aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, sleep_state);
 -    *sleep_state = &state;
 +    w->to_wake = co;
 +    aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, w),
      timer_mod(&ts, qemu_clock_get_ns(type) + ns);
      qemu_coroutine_yield();
      timer_del(&ts);
 -    /* qemu_co_sleep_wake clears *sleep_state before resuming this coroutine.  */
 -    assert(*sleep_state == NULL);
 +    /* w->to_wake is cleared before resuming this coroutine.  */
 +    assert(w->to_wake == NULL);
  }
 --
-.14.3
+.31.1

-[Qemu-devel] [PULL 3/6] util/uri.c: wrap single statement blocks with braces {}
+[PULL 8/8] coroutine-sleep: introduce qemu_co_sleep
-From: Su Hang <suhang16@mails.ucas.ac.cn>
+From: Paolo Bonzini <pbonzini@redhat.com>
-For this patch, using curly braces to wrap `if` `while` `else` statements,
+Allow using QemuCoSleep to sleep forever until woken by qemu_co_sleep_wake.
-which only hold single statement. For example:
+This makes the logic of qemu_co_sleep_ns_wakeable easy to understand.
 '''
 if (cond)
     statement;
 '''
 to
 '''
 if (cond) {
     statement;
 }
 '''
-And using tricks that compare the disassemblies before and after
+In the future we will introduce an API that can work even if the
-code changes, to make sure code logic isn't changed:
+sleep and wake happen from different threads.  For now, initializing
-'''
+w->to_wake after timer_mod is fine because the timer can only fire in
-git checkout master
+the same AioContext.
 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
+Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Message-id: 20210517100548.28806-7-pbonzini@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- util/uri.c | 463 +++++++++++++++++++++++++++++++++++++++----------------------
+ include/qemu/coroutine.h    |  5 +++++
-file changed, 294 insertions(+), 169 deletions(-)
+ util/qemu-coroutine-sleep.c | 26 +++++++++++++++++++-------
 files changed, 24 insertions(+), 7 deletions(-)
-diff --git a/util/uri.c b/util/uri.c
+diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
 index XXXXXXX..XXXXXXX 100644
---- a/util/uri.c
+--- a/include/qemu/coroutine.h
-+++ b/util/uri.c
++++ b/include/qemu/coroutine.h
-@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_scheme(URI *uri, const char **str)
+@@ -XXX,XX +XXX,XX @@ typedef struct QemuCoSleep {
  void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
                                              QEMUClockType type, int64_t ns);
 +/**
 + * Yield the coroutine until the next call to qemu_co_sleep_wake.
 + */
 +void coroutine_fn qemu_co_sleep(QemuCoSleep *w);
 +
  static inline void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns)
  {
-     const char *cur;
+     QemuCoSleep w = { 0 };
+diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
--    if (str == NULL)
+index XXXXXXX..XXXXXXX 100644
-+    if (str == NULL) {
+--- a/util/qemu-coroutine-sleep.c
-         return -1;
++++ b/util/qemu-coroutine-sleep.c
-+    }
+@@ -XXX,XX +XXX,XX @@ static void co_sleep_cb(void *opaque)
+     qemu_co_sleep_wake(w);
-     cur = *str;
+ }
--    if (!ISA_ALPHA(cur))
-+    if (!ISA_ALPHA(cur)) {
+-void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
-         return 2;
+-                                            QEMUClockType type, int64_t ns)
-+    }
++void coroutine_fn qemu_co_sleep(QemuCoSleep *w)
      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;
+     Coroutine *co = qemu_coroutine_self();
+-    AioContext *ctx = qemu_get_current_aio_context();
--    if (str == NULL)
+-    QEMUTimer ts;
-+    if (str == NULL) {
-         return -1;
+     const char *scheduled = qatomic_cmpxchg(&co->scheduled, NULL,
-+    }
+                                             qemu_co_sleep_ns__scheduled);
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
      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
 +        } else {
              uri->fragment = uri_string_unescape(*str, cur - *str, NULL);
 +        }
      }
-     *str = cur;
-     return 0;
+     w->to_wake = co;
-@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_query(URI *uri, const char **str)
+-    aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, w),
- {
+-    timer_mod(&ts, qemu_clock_get_ns(type) + ns);
-     const char *cur;
+     qemu_coroutine_yield();
+-    timer_del(&ts);
--    if (str == NULL)
-+    if (str == NULL) {
+     /* w->to_wake is cleared before resuming this coroutine.  */
-         return -1;
+     assert(w->to_wake == NULL);
 +    }
      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)
++
-      */
++void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
-     if (*cur == '[') {
++                                            QEMUClockType type, int64_t ns)
-         cur++;
++{
--        while ((*cur != ']') && (*cur != 0))
++    AioContext *ctx = qemu_get_current_aio_context();
-+        while ((*cur != ']') && (*cur != 0)) {
++    QEMUTimer ts;
-             cur++;
++
--        if (*cur != ']')
++    aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, w);
-+        }
++    timer_mod(&ts, qemu_clock_get_ns(type) + ns);
-+        if (*cur != ']') {
++
-             return 1;
++    /*
-+        }
++     * The timer will fire in the current AiOContext, so the callback
-         cur++;
++     * must happen after qemu_co_sleep yields and there is no race
-         goto found;
++     * between timer_mod and qemu_co_sleep.
-     }
++     */
-@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_host(URI *uri, const char **str)
++    qemu_co_sleep(w);
-      * try to parse an IPv4
++    timer_del(&ts);
-      */
++}
      if (ISA_DIGIT(cur)) {
 -        if (rfc3986_parse_dec_octet(&cur) != 0)
 +        if (rfc3986_parse_dec_octet(&cur) != 0) {
              goto not_ipv4;
 -        if (*cur != '.')
 +        }
 +        if (*cur != '.') {
              goto not_ipv4;
 +        }
          cur++;
 -        if (rfc3986_parse_dec_octet(&cur) != 0)
 +        if (rfc3986_parse_dec_octet(&cur) != 0) {
              goto not_ipv4;
 -        if (*cur != '.')
 +        }
 +        if (*cur != '.') {
              goto not_ipv4;
 -        if (rfc3986_parse_dec_octet(&cur) != 0)
 +        }
 +        if (rfc3986_parse_dec_octet(&cur) != 0) {
              goto not_ipv4;
 -        if (*cur != '.')
 +        }
 +        if (*cur != '.') {
              goto not_ipv4;
 -        if (rfc3986_parse_dec_octet(&cur) != 0)
 +        }
 +        if (rfc3986_parse_dec_octet(&cur) != 0) {
              goto not_ipv4;
 +        }
          goto found;
      not_ipv4:
          cur = *str;
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_host(URI *uri, const char **str)
      /*
       * then this should be a hostname which can be empty
       */
 -    while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cur))
 +    while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cur)) {
          NEXT(cur);
 +    }
  found:
      if (uri != NULL) {
          g_free(uri->authority);
          uri->authority = NULL;
          g_free(uri->server);
          if (cur != host) {
 -            if (uri->cleanup & 2)
 +            if (uri->cleanup & 2) {
                  uri->server = g_strndup(host, cur - host);
 -            else
 +            } else {
                  uri->server = uri_string_unescape(host, cur - host, NULL);
 -        } else
 +            }
 +        } else {
              uri->server = NULL;
 +        }
      }
      *str = cur;
      return 0;
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_authority(URI *uri, const char **str)
       * try to parse a userinfo and check for the trailing @
       */
      ret = rfc3986_parse_user_info(uri, &cur);
 -    if ((ret != 0) || (*cur != '@'))
 +    if ((ret != 0) || (*cur != '@')) {
          cur = *str;
 -    else
 +    } else {
          cur++;
 +    }
      ret = rfc3986_parse_host(uri, &cur);
 -    if (ret != 0)
 +    if (ret != 0) {
          return ret;
 +    }
      if (*cur == ':') {
          cur++;
          ret = rfc3986_parse_port(uri, &cur);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
      }
      *str = cur;
      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)
 +        if (empty) {
              return 0;
 +        }
          return 1;
      }
 -    while (ISA_PCHAR(cur) && (*cur != forbid))
 +    while (ISA_PCHAR(cur) && (*cur != forbid)) {
          NEXT(cur);
 +    }
      *str = cur;
      return 0;
  }
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_ab_empty(URI *uri, const char **str)
      while (*cur == '/') {
          cur++;
          ret = rfc3986_parse_segment(&cur, 0, 1);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
      }
      if (uri != NULL) {
          g_free(uri->path);
          if (*str != cur) {
 -            if (uri->cleanup & 2)
 +            if (uri->cleanup & 2) {
                  uri->path = g_strndup(*str, cur - *str);
 -            else
 +            } else {
                  uri->path = uri_string_unescape(*str, cur - *str, NULL);
 +            }
          } else {
              uri->path = NULL;
          }
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_absolute(URI *uri, const char **str)
      cur = *str;
 -    if (*cur != '/')
 +    if (*cur != '/') {
          return 1;
 +    }
      cur++;
      ret = rfc3986_parse_segment(&cur, 0, 0);
      if (ret == 0) {
          while (*cur == '/') {
              cur++;
              ret = rfc3986_parse_segment(&cur, 0, 1);
 -            if (ret != 0)
 +            if (ret != 0) {
                  return ret;
 +            }
          }
      }
      if (uri != NULL) {
          g_free(uri->path);
          if (cur != *str) {
 -            if (uri->cleanup & 2)
 +            if (uri->cleanup & 2) {
                  uri->path = g_strndup(*str, cur - *str);
 -            else
 +            } else {
                  uri->path = uri_string_unescape(*str, cur - *str, NULL);
 +            }
          } else {
              uri->path = NULL;
          }
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_rootless(URI *uri, const char **str)
      cur = *str;
      ret = rfc3986_parse_segment(&cur, 0, 0);
 -    if (ret != 0)
 +    if (ret != 0) {
          return ret;
 +    }
      while (*cur == '/') {
          cur++;
          ret = rfc3986_parse_segment(&cur, 0, 1);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
      }
      if (uri != NULL) {
          g_free(uri->path);
          if (cur != *str) {
 -            if (uri->cleanup & 2)
 +            if (uri->cleanup & 2) {
                  uri->path = g_strndup(*str, cur - *str);
 -            else
 +            } else {
                  uri->path = uri_string_unescape(*str, cur - *str, NULL);
 +            }
          } else {
              uri->path = NULL;
          }
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_no_scheme(URI *uri, const char **str)
      cur = *str;
      ret = rfc3986_parse_segment(&cur, ':', 0);
 -    if (ret != 0)
 +    if (ret != 0) {
          return ret;
 +    }
      while (*cur == '/') {
          cur++;
          ret = rfc3986_parse_segment(&cur, 0, 1);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
      }
      if (uri != NULL) {
          g_free(uri->path);
          if (cur != *str) {
 -            if (uri->cleanup & 2)
 +            if (uri->cleanup & 2) {
                  uri->path = g_strndup(*str, cur - *str);
 -            else
 +            } else {
                  uri->path = uri_string_unescape(*str, cur - *str, NULL);
 +            }
          } else {
              uri->path = NULL;
          }
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_hier_part(URI *uri, const char **str)
      if ((*cur == '/') && (*(cur + 1) == '/')) {
          cur += 2;
          ret = rfc3986_parse_authority(uri, &cur);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
          ret = rfc3986_parse_path_ab_empty(uri, &cur);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
          *str = cur;
          return 0;
      } else if (*cur == '/') {
          ret = rfc3986_parse_path_absolute(uri, &cur);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
      } else if (ISA_PCHAR(cur)) {
          ret = rfc3986_parse_path_rootless(uri, &cur);
 -        if (ret != 0)
 +        if (ret != 0) {
              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)
      if ((*str == '/') && (*(str + 1) == '/')) {
          str += 2;
          ret = rfc3986_parse_authority(uri, &str);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
          ret = rfc3986_parse_path_ab_empty(uri, &str);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
      } else if (*str == '/') {
          ret = rfc3986_parse_path_absolute(uri, &str);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
      } else if (ISA_PCHAR(str)) {
          ret = rfc3986_parse_path_no_scheme(uri, &str);
 -        if (ret != 0)
 +        if (ret != 0) {
              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)
      if (*str == '?') {
          str++;
          ret = rfc3986_parse_query(uri, &str);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
      }
      if (*str == '#') {
          str++;
          ret = rfc3986_parse_fragment(uri, &str);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
      }
      if (*str != 0) {
          uri_clean(uri);
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse(URI *uri, const char *str)
      int ret;
      ret = rfc3986_parse_scheme(uri, &str);
 -    if (ret != 0)
 +    if (ret != 0) {
          return ret;
 +    }
      if (*str != ':') {
          return 1;
      }
      str++;
      ret = rfc3986_parse_hier_part(uri, &str);
 -    if (ret != 0)
 +    if (ret != 0) {
          return ret;
 +    }
      if (*str == '?') {
          str++;
          ret = rfc3986_parse_query(uri, &str);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
      }
      if (*str == '#') {
          str++;
          ret = rfc3986_parse_fragment(uri, &str);
 -        if (ret != 0)
 +        if (ret != 0) {
              return ret;
 +        }
      }
      if (*str != 0) {
          uri_clean(uri);
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_uri_reference(URI *uri, const char *str)
  {
      int ret;
 -    if (str == NULL)
 +    if (str == NULL) {
          return -1;
 +    }
      uri_clean(uri);
      /*
@@ -XXX,XX +XXX,XX @@ URI *uri_parse(const char *str)
      URI *uri;
      int ret;
 -    if (str == NULL)
 +    if (str == NULL) {
          return NULL;
 +    }
      uri = uri_new();
      ret = rfc3986_parse_uri_reference(uri, str);
      if (ret) {
@@ -XXX,XX +XXX,XX @@ URI *uri_parse_raw(const char *str, int raw)
      URI *uri;
      int ret;
 -    if (str == NULL)
 +    if (str == NULL) {
          return NULL;
 +    }
      uri = uri_new();
      if (raw) {
          uri->cleanup |= 2;
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
      int len;
      int max;
 -    if (uri == NULL)
 +    if (uri == NULL) {
          return NULL;
 +    }
      max = 80;
      ret = g_malloc(max + 1);
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
                  temp = realloc2n(ret, &max);
                  ret = temp;
              }
 -            if (IS_RESERVED(*(p)) || IS_UNRESERVED(*(p)))
 +            if (IS_RESERVED(*(p)) || IS_UNRESERVED(*(p))) {
                  ret[len++] = *p++;
 -            else {
 +            } else {
                  int val = *(unsigned char *)p++;
                  int hi = val / 0x10, lo = val % 0x10;
                  ret[len++] = '%';
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
                      }
                      if ((IS_UNRESERVED(*(p))) || ((*(p) == ';')) ||
                          ((*(p) == ':')) || ((*(p) == '&')) || ((*(p) == '=')) ||
 -                        ((*(p) == '+')) || ((*(p) == '$')) || ((*(p) == ',')))
 +                        ((*(p) == '+')) || ((*(p) == '$')) || ((*(p) == ','))) {
                          ret[len++] = *p++;
 -                    else {
 +                    } else {
                          int val = *(unsigned char *)p++;
                          int hi = val / 0x10, lo = val % 0x10;
                          ret[len++] = '%';
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
                  if ((IS_UNRESERVED(*(p))) || ((*(p) == '$')) ||
                      ((*(p) == ',')) || ((*(p) == ';')) || ((*(p) == ':')) ||
                      ((*(p) == '@')) || ((*(p) == '&')) || ((*(p) == '=')) ||
 -                    ((*(p) == '+')))
 +                    ((*(p) == '+'))) {
                      ret[len++] = *p++;
 -                else {
 +                } else {
                      int val = *(unsigned char *)p++;
                      int hi = val / 0x10, lo = val % 0x10;
                      ret[len++] = '%';
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
                  if ((IS_UNRESERVED(*(p))) || ((*(p) == '/')) ||
                      ((*(p) == ';')) || ((*(p) == '@')) || ((*(p) == '&')) ||
                      ((*(p) == '=')) || ((*(p) == '+')) || ((*(p) == '$')) ||
 -                    ((*(p) == ',')))
 +                    ((*(p) == ','))) {
                      ret[len++] = *p++;
 -                else {
 +                } else {
                      int val = *(unsigned char *)p++;
                      int hi = val / 0x10, lo = val % 0x10;
                      ret[len++] = '%';
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
                  temp = realloc2n(ret, &max);
                  ret = temp;
              }
 -            if ((IS_UNRESERVED(*(p))) || (IS_RESERVED(*(p))))
 +            if ((IS_UNRESERVED(*(p))) || (IS_RESERVED(*(p)))) {
                  ret[len++] = *p++;
 -            else {
 +            } else {
                  int val = *(unsigned char *)p++;
                  int hi = val / 0x10, lo = val % 0x10;
                  ret[len++] = '%';
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
   */
  static void uri_clean(URI *uri)
  {
 -    if (uri == NULL)
 +    if (uri == NULL) {
          return;
 +    }
      g_free(uri->scheme);
      uri->scheme = NULL;
@@ -XXX,XX +XXX,XX @@ static int normalize_uri_path(char *path)
  {
      char *cur, *out;
 -    if (path == NULL)
 +    if (path == NULL) {
          return -1;
 +    }
      /* Skip all initial "/" chars.  We want to get to the beginning of the
       * first non-empty segment.
       */
      cur = path;
 -    while (cur[0] == '/')
 +    while (cur[0] == '/') {
          ++cur;
 -    if (cur[0] == '\0')
 +    }
 +    if (cur[0] == '\0') {
          return 0;
 +    }
      /* Keep everything we've seen so far.  */
      out = cur;
@@ -XXX,XX +XXX,XX @@ static int normalize_uri_path(char *path)
          if ((cur[0] == '.') && (cur[1] == '/')) {
              cur += 2;
              /* '//' normalization should be done at this point too */
 -            while (cur[0] == '/')
 +            while (cur[0] == '/') {
                  cur++;
 +            }
              continue;
          }
@@ -XXX,XX +XXX,XX @@ static int normalize_uri_path(char *path)
           * d) If the buffer string ends with "." as a complete path segment,
           *    that "." is removed.
           */
 -        if ((cur[0] == '.') && (cur[1] == '\0'))
 +        if ((cur[0] == '.') && (cur[1] == '\0')) {
              break;
 +        }
          /* Otherwise keep the segment.  */
          while (cur[0] != '/') {
 -            if (cur[0] == '\0')
 +            if (cur[0] == '\0') {
                  goto done_cd;
 +            }
              (out++)[0] = (cur++)[0];
          }
          /* nomalize // */
 -        while ((cur[0] == '/') && (cur[1] == '/'))
 +        while ((cur[0] == '/') && (cur[1] == '/')) {
              cur++;
 +        }
          (out++)[0] = (cur++)[0];
      }
@@ -XXX,XX +XXX,XX @@ done_cd:
      /* Reset to the beginning of the first segment for the next sequence.  */
      cur = path;
 -    while (cur[0] == '/')
 +    while (cur[0] == '/') {
          ++cur;
 -    if (cur[0] == '\0')
 +    }
 +    if (cur[0] == '\0') {
          return 0;
 +    }
      /*
       * Analyze each segment in sequence for cases (e) and (f).
@@ -XXX,XX +XXX,XX @@ done_cd:
          /* Find the end of the current segment.  */
          segp = cur;
 -        while ((segp[0] != '/') && (segp[0] != '\0'))
 +        while ((segp[0] != '/') && (segp[0] != '\0')) {
              ++segp;
 +        }
          /* If this is the last segment, we're done (we need at least two
           * segments to meet the criteria for the (e) and (f) cases).
           */
 -        if (segp[0] == '\0')
 +        if (segp[0] == '\0') {
              break;
 +        }
          /* If the first segment is "..", or if the next segment _isn't_ "..",
           * keep this segment and try the next one.
@@ -XXX,XX +XXX,XX @@ done_cd:
          /* string will overlap, do not use strcpy */
          tmp = cur;
          segp += 3;
 -        while ((*tmp++ = *segp++) != 0)
 -            ;
 +        while ((*tmp++ = *segp++) != 0) {
 +            /* No further work */
 +        }
          /* If there are no previous segments, then keep going from here.  */
          segp = cur;
 -        while ((segp > path) && ((--segp)[0] == '/'))
 -            ;
 -        if (segp == path)
 +        while ((segp > path) && ((--segp)[0] == '/')) {
 +            /* No further work */
 +        }
 +        if (segp == path) {
              continue;
 +        }
          /* "segp" is pointing to the end of a previous segment; find it's
           * start.  We need to back up to the previous segment and start
@@ -XXX,XX +XXX,XX @@ done_cd:
           * remove the "foo/..".
           */
          cur = segp;
 -        while ((cur > path) && (cur[-1] != '/'))
 +        while ((cur > path) && (cur[-1] != '/')) {
              --cur;
 +        }
      }
      out[0] = '\0';
@@ -XXX,XX +XXX,XX @@ done_cd:
      if (path[0] == '/') {
          cur = path;
          while ((cur[0] == '/') && (cur[1] == '.') && (cur[2] == '.') &&
 -               ((cur[3] == '/') || (cur[3] == '\0')))
 +               ((cur[3] == '/') || (cur[3] == '\0'))) {
              cur += 3;
 +        }
          if (cur != path) {
              out = path;
 -            while (cur[0] != '\0')
 +            while (cur[0] != '\0') {
                  (out++)[0] = (cur++)[0];
 +            }
              out[0] = 0;
          }
      }
@@ -XXX,XX +XXX,XX @@ done_cd:
  static int is_hex(char c)
  {
      if (((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) ||
 -        ((c >= 'A') && (c <= 'F')))
 +        ((c >= 'A') && (c <= 'F'))) {
          return 1;
 +    }
      return 0;
  }
@@ -XXX,XX +XXX,XX @@ char *uri_string_unescape(const char *str, int len, char *target)
      char *ret, *out;
      const char *in;
 -    if (str == NULL)
 +    if (str == NULL) {
          return NULL;
 -    if (len <= 0)
 +    }
 +    if (len <= 0) {
          len = strlen(str);
 -    if (len < 0)
 +    }
 +    if (len < 0) {
          return NULL;
 +    }
      if (target == NULL) {
          ret = g_malloc(len + 1);
 -    } else
 +    } else {
          ret = target;
 +    }
      in = str;
      out = ret;
      while (len > 0) {
          if ((len > 2) && (*in == '%') && (is_hex(in[1])) && (is_hex(in[2]))) {
              in++;
 -            if ((*in >= '0') && (*in <= '9'))
 +            if ((*in >= '0') && (*in <= '9')) {
                  *out = (*in - '0');
 -            else if ((*in >= 'a') && (*in <= 'f'))
 +            } else if ((*in >= 'a') && (*in <= 'f')) {
                  *out = (*in - 'a') + 10;
 -            else if ((*in >= 'A') && (*in <= 'F'))
 +            } else if ((*in >= 'A') && (*in <= 'F')) {
                  *out = (*in - 'A') + 10;
 +            }
              in++;
 -            if ((*in >= '0') && (*in <= '9'))
 +            if ((*in >= '0') && (*in <= '9')) {
                  *out = *out * 16 + (*in - '0');
 -            else if ((*in >= 'a') && (*in <= 'f'))
 +            } else if ((*in >= 'a') && (*in <= 'f')) {
                  *out = *out * 16 + (*in - 'a') + 10;
 -            else if ((*in >= 'A') && (*in <= 'F'))
 +            } else if ((*in >= 'A') && (*in <= 'F')) {
                  *out = *out * 16 + (*in - 'A') + 10;
 +            }
              in++;
              len -= 3;
              out++;
@@ -XXX,XX +XXX,XX @@ char *uri_string_escape(const char *str, const char *list)
      const char *in;
      int len, out;
 -    if (str == NULL)
 +    if (str == NULL) {
          return NULL;
 -    if (str[0] == 0)
 +    }
 +    if (str[0] == 0) {
          return g_strdup(str);
 +    }
      len = strlen(str);
 -    if (!(len > 0))
 +    if (!(len > 0)) {
          return NULL;
 +    }
      len += 20;
      ret = g_malloc(len);
@@ -XXX,XX +XXX,XX @@ char *uri_string_escape(const char *str, const char *list)
              unsigned char val;
              ret[out++] = '%';
              val = ch >> 4;
 -            if (val <= 9)
 +            if (val <= 9) {
                  ret[out++] = '0' + val;
 -            else
 +            } else {
                  ret[out++] = 'A' + val - 0xA;
 +            }
              val = ch & 0xF;
 -            if (val <= 9)
 +            if (val <= 9) {
                  ret[out++] = '0' + val;
 -            else
 +            } else {
                  ret[out++] = 'A' + val - 0xA;
 +            }
              in++;
          } else {
              ret[out++] = *in++;
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
       *    as a reference to "." rather than as a synonym for the current
       *    URI.  Should we do that here?
       */
 -    if (uri == NULL)
 +    if (uri == NULL) {
          ret = -1;
 -    else {
 +    } else {
          if (*uri) {
              ref = uri_new();
              ret = uri_parse_into(ref, uri);
 -        } else
 +        } else {
              ret = 0;
 +        }
      }
 -    if (ret != 0)
 +    if (ret != 0) {
          goto done;
 +    }
      if ((ref != NULL) && (ref->scheme != NULL)) {
          /*
           * The URI is absolute don't modify.
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
          val = g_strdup(uri);
          goto done;
      }
 -    if (base == NULL)
 +    if (base == NULL) {
          ret = -1;
 -    else {
 +    } else {
          bas = uri_new();
          ret = uri_parse_into(bas, base);
      }
      if (ret != 0) {
 -        if (ref)
 +        if (ref) {
              val = uri_to_string(ref);
 +        }
          goto done;
      }
      if (ref == NULL) {
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
      if ((ref->scheme == NULL) && (ref->path == NULL) &&
          ((ref->authority == NULL) && (ref->server == NULL))) {
          res->scheme = g_strdup(bas->scheme);
 -        if (bas->authority != NULL)
 +        if (bas->authority != NULL) {
              res->authority = g_strdup(bas->authority);
 -        else if (bas->server != NULL) {
 +        } else if (bas->server != NULL) {
              res->server = g_strdup(bas->server);
              res->user = g_strdup(bas->user);
              res->port = bas->port;
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
       *    use an authority component.
       */
      if ((ref->authority != NULL) || (ref->server != NULL)) {
 -        if (ref->authority != NULL)
 +        if (ref->authority != NULL) {
              res->authority = g_strdup(ref->authority);
 -        else {
 +        } else {
              res->server = g_strdup(ref->server);
              res->user = g_strdup(ref->user);
              res->port = ref->port;
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
          res->path = g_strdup(ref->path);
          goto step_7;
      }
 -    if (bas->authority != NULL)
 +    if (bas->authority != NULL) {
          res->authority = g_strdup(bas->authority);
 -    else if (bas->server != NULL) {
 +    } else if (bas->server != NULL) {
          res->server = g_strdup(bas->server);
          res->user = g_strdup(bas->user);
          res->port = bas->port;
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
       * Allocate a buffer large enough for the result string.
       */
      len = 2; /* extra / and 0 */
 -    if (ref->path != NULL)
 +    if (ref->path != NULL) {
          len += strlen(ref->path);
 -    if (bas->path != NULL)
 +    }
 +    if (bas->path != NULL) {
          len += strlen(bas->path);
 +    }
      res->path = g_malloc(len);
      res->path[0] = 0;
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
      out = 0;
      if (bas->path != NULL) {
          while (bas->path[cur] != 0) {
 -            while ((bas->path[cur] != 0) && (bas->path[cur] != '/'))
 +            while ((bas->path[cur] != 0) && (bas->path[cur] != '/')) {
                  cur++;
 -            if (bas->path[cur] == 0)
 +            }
 +            if (bas->path[cur] == 0) {
                  break;
 +            }
              cur++;
              while (out < cur) {
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
          /*
           * Ensure the path includes a '/'
           */
 -        if ((out == 0) && (bas->server != NULL))
 +        if ((out == 0) && (bas->server != NULL)) {
              res->path[out++] = '/';
 +        }
          while (ref->path[indx] != 0) {
              res->path[out++] = ref->path[indx++];
          }
@@ -XXX,XX +XXX,XX @@ step_7:
      val = uri_to_string(res);
  done:
 -    if (ref != NULL)
 +    if (ref != NULL) {
          uri_free(ref);
 -    if (bas != NULL)
 +    }
 +    if (bas != NULL) {
          uri_free(bas);
 -    if (res != NULL)
 +    }
 +    if (res != NULL) {
          uri_free(res);
 +    }
      return val;
  }
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
      char *bptr, *uptr, *vptr;
      int remove_path = 0;
 -    if ((uri == NULL) || (*uri == 0))
 +    if ((uri == NULL) || (*uri == 0)) {
          return NULL;
 +    }
      /*
       * First parse URI into a standard form
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
      /* If URI not already in "relative" form */
      if (uri[0] != '.') {
          ret = uri_parse_into(ref, uri);
 -        if (ret != 0)
 +        if (ret != 0) {
              goto done; /* Error in URI, return NULL */
 -    } else
 +        }
 +    } else {
          ref->path = g_strdup(uri);
 +    }
      /*
       * Next parse base into the same standard form
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
      bas = uri_new();
      if (base[0] != '.') {
          ret = uri_parse_into(bas, base);
 -        if (ret != 0)
 +        if (ret != 0) {
              goto done; /* Error in base, return NULL */
 -    } else
 +        }
 +    } else {
          bas->path = g_strdup(base);
 +    }
      /*
       * If the scheme / server on the URI differs from the base,
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
      if (bas->path == NULL) {
          if (ref->path != NULL) {
              uptr = ref->path;
 -            if (*uptr == '/')
 +            if (*uptr == '/') {
                  uptr++;
 +            }
              /* exception characters from uri_to_string */
              val = uri_string_escape(uptr, "/;&=+$,");
          }
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
      bptr = bas->path;
      if (ref->path == NULL) {
          for (ix = 0; bptr[ix] != 0; ix++) {
 -            if (bptr[ix] == '/')
 +            if (bptr[ix] == '/') {
                  nbslash++;
 +            }
          }
          uptr = NULL;
          len = 1; /* this is for a string terminator only */
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
          /*
           * Next we compare the two strings and find where they first differ
           */
 -        if ((ref->path[pos] == '.') && (ref->path[pos + 1] == '/'))
 +        if ((ref->path[pos] == '.') && (ref->path[pos + 1] == '/')) {
              pos += 2;
 -        if ((*bptr == '.') && (bptr[1] == '/'))
 +        }
 +        if ((*bptr == '.') && (bptr[1] == '/')) {
              bptr += 2;
 -        else if ((*bptr == '/') && (ref->path[pos] != '/'))
 +        } else if ((*bptr == '/') && (ref->path[pos] != '/')) {
              bptr++;
 -        while ((bptr[pos] == ref->path[pos]) && (bptr[pos] != 0))
 +        }
 +        while ((bptr[pos] == ref->path[pos]) && (bptr[pos] != 0)) {
              pos++;
 +        }
          if (bptr[pos] == ref->path[pos]) {
              val = g_strdup("");
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
           * beginning of the "unique" suffix of URI
           */
          ix = pos;
 -        if ((ref->path[ix] == '/') && (ix > 0))
 +        if ((ref->path[ix] == '/') && (ix > 0)) {
              ix--;
 -        else if ((ref->path[ix] == 0) && (ix > 1) && (ref->path[ix - 1] == '/'))
 +        } else if ((ref->path[ix] == 0) && (ix > 1)
 +                && (ref->path[ix - 1] == '/')) {
              ix -= 2;
 +        }
          for (; ix > 0; ix--) {
 -            if (ref->path[ix] == '/')
 +            if (ref->path[ix] == '/') {
                  break;
 +            }
          }
          if (ix == 0) {
              uptr = ref->path;
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
           */
          if (bptr[pos] != ref->path[pos]) { /* check for trivial URI == base */
              for (; bptr[ix] != 0; ix++) {
 -                if (bptr[ix] == '/')
 +                if (bptr[ix] == '/') {
                      nbslash++;
 +                }
              }
          }
          len = strlen(uptr) + 1;
      }
      if (nbslash == 0) {
 -        if (uptr != NULL)
 +        if (uptr != NULL) {
              /* exception characters from uri_to_string */
              val = uri_string_escape(uptr, "/;&=+$,");
 +        }
          goto done;
      }
@@ -XXX,XX +XXX,XX @@ done:
      /*
       * Free the working variables
       */
 -    if (remove_path != 0)
 +    if (remove_path != 0) {
          ref->path = NULL;
 -    if (ref != NULL)
 +    }
 +    if (ref != NULL) {
          uri_free(ref);
 -    if (bas != NULL)
 +    }
 +    if (bas != NULL) {
          uri_free(bas);
 +    }
      return val;
  }
@@ -XXX,XX +XXX,XX @@ struct QueryParams *query_params_new(int init_alloc)
  {
      struct QueryParams *ps;
 -    if (init_alloc <= 0)
 +    if (init_alloc <= 0) {
          init_alloc = 1;
 +    }
      ps = g_new(QueryParams, 1);
      ps->n = 0;
@@ -XXX,XX +XXX,XX @@ struct QueryParams *query_params_parse(const char *query)
      const char *end, *eq;
      ps = query_params_new(0);
 -    if (!query || query[0] == '\0')
 +    if (!query || query[0] == '\0') {
          return ps;
 +    }
      while (*query) {
          char *name = NULL, *value = NULL;
          /* Find the next separator, or end of the string. */
          end = strchr(query, '&');
 -        if (!end)
 +        if (!end) {
              end = strchr(query, ';');
 -        if (!end)
 +        }
 +        if (!end) {
              end = query + strlen(query);
 +        }
          /* Find the first '=' character between here and end. */
          eq = strchr(query, '=');
 -        if (eq && eq >= end)
 +        if (eq && eq >= end) {
              eq = NULL;
 +        }
          /* Empty section (eg. "&&"). */
 -        if (end == query)
 +        if (end == query) {
              goto next;
 +        }
          /* If there is no '=' character, then we have just "name"
           * and consistent with CGI.pm we assume value is "".
@@ -XXX,XX +XXX,XX @@ struct QueryParams *query_params_parse(const char *query)
          /* If the '=' character is at the beginning then we have
           * "=value" and consistent with CGI.pm we _ignore_ this.
           */
 -        else if (query == eq)
 +        else if (query == eq) {
              goto next;
 +        }
          /* Otherwise it's "name=value". */
          else {
@@ -XXX,XX +XXX,XX @@ struct QueryParams *query_params_parse(const char *query)
      next:
          query = end;
 -        if (*query)
 +        if (*query) {
              query++; /* skip '&' separator */
 +        }
      }
      return ps;
 --
-.14.3
+.31.1

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)

are available in the Git repository at:

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: Su Hang <suhang16@mails.ucas.ac.cn>

Using `clang-format -i util/uri.c` first, then change back few code
manually, to make sure only whitespace involved.

Signed-off-by: Su Hang <suhang16@mails.ucas.ac.cn>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 1519533358-13759-2-git-send-email-suhang16@mails.ucas.ac.cn
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/uri.c | 1450 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 726 insertions(+), 724 deletions(-)

diff --git a/util/uri.c b/util/uri.c
index XXXXXXX..XXXXXXX 100644
--- a/util/uri.c
+++ b/util/uri.c
@@ -XXX,XX +XXX,XX @@ static void uri_clean(URI *uri);
  */
 #define IS_ALPHA(x) (IS_LOWALPHA(x) || IS_UPALPHA(x))
 
-
 /*
  * lowalpha = "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" | "j" |
  *            "k" | "l" | "m" | "n" | "o" | "p" | "q" | "r" | "s" | "t" |
@@ -XXX,XX +XXX,XX @@ static void uri_clean(URI *uri);
  * mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
  */
 
-#define IS_MARK(x) (((x) == '-') || ((x) == '_') || ((x) == '.') ||     \
-    ((x) == '!') || ((x) == '~') || ((x) == '*') || ((x) == '\'') ||    \
+#define IS_MARK(x) (((x) == '-') || ((x) == '_') || ((x) == '.') ||            \
+    ((x) == '!') || ((x) == '~') || ((x) == '*') || ((x) == '\'') ||           \
     ((x) == '(') || ((x) == ')'))
 
 /*
  * unwise = "{" | "}" | "|" | "\" | "^" | "`"
  */
 
-#define IS_UNWISE(p)                                                    \
-      (((*(p) == '{')) || ((*(p) == '}')) || ((*(p) == '|')) ||         \
-       ((*(p) == '\\')) || ((*(p) == '^')) || ((*(p) == '[')) ||        \
-       ((*(p) == ']')) || ((*(p) == '`')))
+#define IS_UNWISE(p)                                                           \
+    (((*(p) == '{')) || ((*(p) == '}')) || ((*(p) == '|')) ||                  \
+     ((*(p) == '\\')) || ((*(p) == '^')) || ((*(p) == '[')) ||                 \
+     ((*(p) == ']')) || ((*(p) == '`')))
 /*
  * reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | "," |
  *            "[" | "]"
  */
 
-#define IS_RESERVED(x) (((x) == ';') || ((x) == '/') || ((x) == '?') || \
-        ((x) == ':') || ((x) == '@') || ((x) == '&') || ((x) == '=') || \
-        ((x) == '+') || ((x) == '$') || ((x) == ',') || ((x) == '[') || \
-        ((x) == ']'))
+#define IS_RESERVED(x) (((x) == ';') || ((x) == '/') || ((x) == '?') ||        \
+    ((x) == ':') || ((x) == '@') || ((x) == '&') || ((x) == '=') ||            \
+    ((x) == '+') || ((x) == '$') || ((x) == ',') || ((x) == '[') ||            \
+    ((x) == ']'))
 
 /*
  * unreserved = alphanum | mark
@@ -XXX,XX +XXX,XX @@ static void uri_clean(URI *uri);
  * Skip to next pointer char, handle escaped sequences
  */
 
-#define NEXT(p) ((*p == '%')? p += 3 : p++)
+#define NEXT(p) ((*p == '%') ? p += 3 : p++)
 
 /*
  * Productions from the spec.
@@ -XXX,XX +XXX,XX @@ static void uri_clean(URI *uri);
  * path          = [ abs_path | opaque_part ]
  */
 
-
 /************************************************************************
- *									*
- *                         RFC 3986 parser				*
- *									*
+ *                                                                      *
+ *                         RFC 3986 parser                              *
+ *                                                                      *
  ************************************************************************/
 
 #define ISA_DIGIT(p) ((*(p) >= '0') && (*(p) <= '9'))
-#define ISA_ALPHA(p) (((*(p) >= 'a') && (*(p) <= 'z')) ||		\
+#define ISA_ALPHA(p) (((*(p) >= 'a') && (*(p) <= 'z')) ||                      \
                       ((*(p) >= 'A') && (*(p) <= 'Z')))
-#define ISA_HEXDIG(p)							\
-       (ISA_DIGIT(p) || ((*(p) >= 'a') && (*(p) <= 'f')) ||		\
-        ((*(p) >= 'A') && (*(p) <= 'F')))
+#define ISA_HEXDIG(p)                                                          \
+    (ISA_DIGIT(p) || ((*(p) >= 'a') && (*(p) <= 'f')) ||                       \
+     ((*(p) >= 'A') && (*(p) <= 'F')))
 
 /*
  *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
  *                     / "*" / "+" / "," / ";" / "="
  */
-#define ISA_SUB_DELIM(p)						\
-      (((*(p) == '!')) || ((*(p) == '$')) || ((*(p) == '&')) ||		\
-       ((*(p) == '(')) || ((*(p) == ')')) || ((*(p) == '*')) ||		\
-       ((*(p) == '+')) || ((*(p) == ',')) || ((*(p) == ';')) ||		\
-       ((*(p) == '=')) || ((*(p) == '\'')))
+#define ISA_SUB_DELIM(p)                                                       \
+    (((*(p) == '!')) || ((*(p) == '$')) || ((*(p) == '&')) ||                  \
+     ((*(p) == '(')) || ((*(p) == ')')) || ((*(p) == '*')) ||                  \
+     ((*(p) == '+')) || ((*(p) == ',')) || ((*(p) == ';')) ||                  \
+     ((*(p) == '=')) || ((*(p) == '\'')))
 
 /*
  *    gen-delims    = ":" / "/" / "?" / "#" / "[" / "]" / "@"
  */
-#define ISA_GEN_DELIM(p)						\
-      (((*(p) == ':')) || ((*(p) == '/')) || ((*(p) == '?')) ||         \
-       ((*(p) == '#')) || ((*(p) == '[')) || ((*(p) == ']')) ||         \
-       ((*(p) == '@')))
+#define ISA_GEN_DELIM(p)                                                       \
+    (((*(p) == ':')) || ((*(p) == '/')) || ((*(p) == '?')) ||                  \
+     ((*(p) == '#')) || ((*(p) == '[')) || ((*(p) == ']')) ||                  \
+     ((*(p) == '@')))
 
 /*
  *    reserved      = gen-delims / sub-delims
@@ -XXX,XX +XXX,XX @@ static void uri_clean(URI *uri);
 /*
  *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
  */
-#define ISA_UNRESERVED(p)						\
-      ((ISA_ALPHA(p)) || (ISA_DIGIT(p)) || ((*(p) == '-')) ||		\
-       ((*(p) == '.')) || ((*(p) == '_')) || ((*(p) == '~')))
+#define ISA_UNRESERVED(p)                                                      \
+    ((ISA_ALPHA(p)) || (ISA_DIGIT(p)) || ((*(p) == '-')) ||                    \
+     ((*(p) == '.')) || ((*(p) == '_')) || ((*(p) == '~')))
 
 /*
  *    pct-encoded   = "%" HEXDIG HEXDIG
  */
-#define ISA_PCT_ENCODED(p)						\
-     ((*(p) == '%') && (ISA_HEXDIG(p + 1)) && (ISA_HEXDIG(p + 2)))
+#define ISA_PCT_ENCODED(p)                                                     \
+    ((*(p) == '%') && (ISA_HEXDIG(p + 1)) && (ISA_HEXDIG(p + 2)))
 
 /*
  *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
  */
-#define ISA_PCHAR(p)							\
-     (ISA_UNRESERVED(p) || ISA_PCT_ENCODED(p) || ISA_SUB_DELIM(p) ||	\
-      ((*(p) == ':')) || ((*(p) == '@')))
+#define ISA_PCHAR(p)                                                           \
+    (ISA_UNRESERVED(p) || ISA_PCT_ENCODED(p) || ISA_SUB_DELIM(p) ||            \
+     ((*(p) == ':')) || ((*(p) == '@')))
 
 /**
  * rfc3986_parse_scheme:
@@ -XXX,XX +XXX,XX @@ static void uri_clean(URI *uri);
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_scheme(URI *uri, const char **str) {
+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 == '.')) cur++;
+    while (ISA_ALPHA(cur) || ISA_DIGIT(cur) || (*cur == '+') || (*cur == '-') ||
+           (*cur == '.'))
+        cur++;
     if (uri != NULL) {
         g_free(uri->scheme);
-	uri->scheme = g_strndup(*str, cur - *str);
+        uri->scheme = g_strndup(*str, cur - *str);
     }
     *str = cur;
-    return(0);
+    return (0);
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_scheme(URI *uri, const char **str) {
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_fragment(URI *uri, const char **str)
+static int rfc3986_parse_fragment(URI *uri, const char **str)
 {
     const char *cur;
 
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_fragment(URI *uri, const char **str)
         NEXT(cur);
     if (uri != NULL) {
         g_free(uri->fragment);
-	if (uri->cleanup & 2)
-	    uri->fragment = g_strndup(*str, cur - *str);
-	else
-	    uri->fragment = uri_string_unescape(*str, cur - *str, NULL);
+        if (uri->cleanup & 2)
+            uri->fragment = g_strndup(*str, cur - *str);
+        else
+            uri->fragment = uri_string_unescape(*str, cur - *str, NULL);
     }
     *str = cur;
     return (0);
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_fragment(URI *uri, const char **str)
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_query(URI *uri, const char **str)
+static int rfc3986_parse_query(URI *uri, const char **str)
 {
     const char *cur;
 
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_query(URI *uri, const char **str)
         NEXT(cur);
     if (uri != NULL) {
         g_free(uri->query);
-	uri->query = g_strndup (*str, cur - *str);
+        uri->query = g_strndup(*str, cur - *str);
     }
     *str = cur;
     return (0);
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_query(URI *uri, const char **str)
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_port(URI *uri, const char **str)
+static int rfc3986_parse_port(URI *uri, const char **str)
 {
     const char *cur = *str;
     int port = 0;
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_port(URI *uri, const char **str)
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_user_info(URI *uri, const char **str)
+static int rfc3986_parse_user_info(URI *uri, const char **str)
 {
     const char *cur;
 
     cur = *str;
-    while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) ||
-           ISA_SUB_DELIM(cur) || (*cur == ':'))
-	NEXT(cur);
+    while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cur) ||
+           (*cur == ':'))
+        NEXT(cur);
     if (*cur == '@') {
-	if (uri != NULL) {
+        if (uri != NULL) {
             g_free(uri->user);
-	    if (uri->cleanup & 2)
-		uri->user = g_strndup(*str, cur - *str);
-	    else
-		uri->user = uri_string_unescape(*str, cur - *str, NULL);
-	}
-	*str = cur;
-	return(0);
+            if (uri->cleanup & 2)
+                uri->user = g_strndup(*str, cur - *str);
+            else
+                uri->user = uri_string_unescape(*str, cur - *str, NULL);
+        }
+        *str = cur;
+        return (0);
     }
-    return(1);
+    return (1);
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_user_info(URI *uri, const char **str)
  *
  * Returns 0 if found and skipped, 1 otherwise
  */
-static int
-rfc3986_parse_dec_octet(const char **str) {
+static int rfc3986_parse_dec_octet(const char **str)
+{
     const char *cur = *str;
 
     if (!(ISA_DIGIT(cur)))
-        return(1);
-    if (!ISA_DIGIT(cur+1))
-	cur++;
-    else if ((*cur != '0') && (ISA_DIGIT(cur + 1)) && (!ISA_DIGIT(cur+2)))
-	cur += 2;
+        return (1);
+    if (!ISA_DIGIT(cur + 1))
+        cur++;
+    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)))
-	cur += 3;
-    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'))
-	cur += 3;
+        cur += 3;
+    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'))
+        cur += 3;
     else
-        return(1);
+        return (1);
     *str = cur;
-    return(0);
+    return (0);
 }
 /**
  * rfc3986_parse_host:
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_dec_octet(const char **str) {
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_host(URI *uri, const char **str)
+static int rfc3986_parse_host(URI *uri, const char **str)
 {
     const char *cur = *str;
     const char *host;
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_host(URI *uri, const char **str)
      */
     if (*cur == '[') {
         cur++;
-	while ((*cur != ']') && (*cur != 0))
-	    cur++;
-	if (*cur != ']')
-	    return(1);
-	cur++;
-	goto found;
+        while ((*cur != ']') && (*cur != 0))
+            cur++;
+        if (*cur != ']')
+            return (1);
+        cur++;
+        goto found;
     }
     /*
      * try to parse an IPv4
      */
     if (ISA_DIGIT(cur)) {
         if (rfc3986_parse_dec_octet(&cur) != 0)
-	    goto not_ipv4;
-	if (*cur != '.')
-	    goto not_ipv4;
-	cur++;
+            goto not_ipv4;
+        if (*cur != '.')
+            goto not_ipv4;
+        cur++;
         if (rfc3986_parse_dec_octet(&cur) != 0)
-	    goto not_ipv4;
-	if (*cur != '.')
-	    goto not_ipv4;
+            goto not_ipv4;
+        if (*cur != '.')
+            goto not_ipv4;
         if (rfc3986_parse_dec_octet(&cur) != 0)
-	    goto not_ipv4;
-	if (*cur != '.')
-	    goto not_ipv4;
+            goto not_ipv4;
+        if (*cur != '.')
+            goto not_ipv4;
         if (rfc3986_parse_dec_octet(&cur) != 0)
-	    goto not_ipv4;
-	goto found;
-not_ipv4:
+            goto not_ipv4;
+        goto found;
+    not_ipv4:
         cur = *str;
     }
     /*
@@ -XXX,XX +XXX,XX @@ not_ipv4:
 found:
     if (uri != NULL) {
         g_free(uri->authority);
-	uri->authority = NULL;
+        uri->authority = NULL;
         g_free(uri->server);
-	if (cur != host) {
-	    if (uri->cleanup & 2)
-		uri->server = g_strndup(host, cur - host);
-	    else
-		uri->server = uri_string_unescape(host, cur - host, NULL);
-	} else
-	    uri->server = NULL;
+        if (cur != host) {
+            if (uri->cleanup & 2)
+                uri->server = g_strndup(host, cur - host);
+            else
+                uri->server = uri_string_unescape(host, cur - host, NULL);
+        } else
+            uri->server = NULL;
     }
     *str = cur;
-    return(0);
+    return (0);
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ found:
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_authority(URI *uri, const char **str)
+static int rfc3986_parse_authority(URI *uri, const char **str)
 {
     const char *cur;
     int ret;
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_authority(URI *uri, const char **str)
     else
         cur++;
     ret = rfc3986_parse_host(uri, &cur);
-    if (ret != 0) return(ret);
+    if (ret != 0)
+        return (ret);
     if (*cur == ':') {
         cur++;
         ret = rfc3986_parse_port(uri, &cur);
-	if (ret != 0) return(ret);
+        if (ret != 0)
+            return (ret);
     }
     *str = cur;
-    return(0);
+    return (0);
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_authority(URI *uri, const char **str)
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_segment(const char **str, char forbid, int empty)
+static int rfc3986_parse_segment(const char **str, char forbid, int empty)
 {
     const char *cur;
 
     cur = *str;
     if (!ISA_PCHAR(cur)) {
         if (empty)
-	    return(0);
-	return(1);
+            return (0);
+        return (1);
     }
     while (ISA_PCHAR(cur) && (*cur != forbid))
         NEXT(cur);
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_segment(const char **str, char forbid, int empty)
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_path_ab_empty(URI *uri, const char **str)
+static int rfc3986_parse_path_ab_empty(URI *uri, const char **str)
 {
     const char *cur;
     int ret;
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_ab_empty(URI *uri, const char **str)
 
     while (*cur == '/') {
         cur++;
-	ret = rfc3986_parse_segment(&cur, 0, 1);
-	if (ret != 0) return(ret);
+        ret = rfc3986_parse_segment(&cur, 0, 1);
+        if (ret != 0)
+            return (ret);
     }
     if (uri != NULL) {
         g_free(uri->path);
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_ab_empty(URI *uri, const char **str)
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_path_absolute(URI *uri, const char **str)
+static int rfc3986_parse_path_absolute(URI *uri, const char **str)
 {
     const char *cur;
     int ret;
@@ -XXX,XX +XXX,XX @@ 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) {
-	while (*cur == '/') {
-	    cur++;
-	    ret = rfc3986_parse_segment(&cur, 0, 1);
-	    if (ret != 0) return(ret);
-	}
+        while (*cur == '/') {
+            cur++;
+            ret = rfc3986_parse_segment(&cur, 0, 1);
+            if (ret != 0)
+                return (ret);
+        }
     }
     if (uri != NULL) {
         g_free(uri->path);
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_absolute(URI *uri, const char **str)
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_path_rootless(URI *uri, const char **str)
+static int rfc3986_parse_path_rootless(URI *uri, const char **str)
 {
     const char *cur;
     int ret;
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_rootless(URI *uri, const char **str)
     cur = *str;
 
     ret = rfc3986_parse_segment(&cur, 0, 0);
-    if (ret != 0) return(ret);
+    if (ret != 0)
+        return (ret);
     while (*cur == '/') {
         cur++;
-	ret = rfc3986_parse_segment(&cur, 0, 1);
-	if (ret != 0) return(ret);
+        ret = rfc3986_parse_segment(&cur, 0, 1);
+        if (ret != 0)
+            return (ret);
     }
     if (uri != NULL) {
         g_free(uri->path);
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_rootless(URI *uri, const char **str)
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_path_no_scheme(URI *uri, const char **str)
+static int rfc3986_parse_path_no_scheme(URI *uri, const char **str)
 {
     const char *cur;
     int ret;
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_no_scheme(URI *uri, const char **str)
     cur = *str;
 
     ret = rfc3986_parse_segment(&cur, ':', 0);
-    if (ret != 0) return(ret);
+    if (ret != 0)
+        return (ret);
     while (*cur == '/') {
         cur++;
-	ret = rfc3986_parse_segment(&cur, 0, 1);
-	if (ret != 0) return(ret);
+        ret = rfc3986_parse_segment(&cur, 0, 1);
+        if (ret != 0)
+            return (ret);
     }
     if (uri != NULL) {
         g_free(uri->path);
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_path_no_scheme(URI *uri, const char **str)
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_hier_part(URI *uri, const char **str)
+static int rfc3986_parse_hier_part(URI *uri, const char **str)
 {
     const char *cur;
     int ret;
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_hier_part(URI *uri, const char **str)
 
     if ((*cur == '/') && (*(cur + 1) == '/')) {
         cur += 2;
-	ret = rfc3986_parse_authority(uri, &cur);
-	if (ret != 0) return(ret);
-	ret = rfc3986_parse_path_ab_empty(uri, &cur);
-	if (ret != 0) return(ret);
-	*str = cur;
-	return(0);
+        ret = rfc3986_parse_authority(uri, &cur);
+        if (ret != 0)
+            return (ret);
+        ret = rfc3986_parse_path_ab_empty(uri, &cur);
+        if (ret != 0)
+            return (ret);
+        *str = cur;
+        return (0);
     } else if (*cur == '/') {
         ret = rfc3986_parse_path_absolute(uri, &cur);
-	if (ret != 0) return(ret);
+        if (ret != 0)
+            return (ret);
     } else if (ISA_PCHAR(cur)) {
         ret = rfc3986_parse_path_rootless(uri, &cur);
-	if (ret != 0) return(ret);
+        if (ret != 0)
+            return (ret);
     } else {
-	/* path-empty is effectively empty */
-	if (uri != NULL) {
+        /* path-empty is effectively empty */
+        if (uri != NULL) {
             g_free(uri->path);
-	    uri->path = NULL;
-	}
+            uri->path = NULL;
+        }
     }
     *str = cur;
     return (0);
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_hier_part(URI *uri, const char **str)
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_relative_ref(URI *uri, const char *str) {
+static int rfc3986_parse_relative_ref(URI *uri, const char *str)
+{
     int ret;
 
     if ((*str == '/') && (*(str + 1) == '/')) {
         str += 2;
-	ret = rfc3986_parse_authority(uri, &str);
-	if (ret != 0) return(ret);
-	ret = rfc3986_parse_path_ab_empty(uri, &str);
-	if (ret != 0) return(ret);
+        ret = rfc3986_parse_authority(uri, &str);
+        if (ret != 0)
+            return (ret);
+        ret = rfc3986_parse_path_ab_empty(uri, &str);
+        if (ret != 0)
+            return (ret);
     } else if (*str == '/') {
-	ret = rfc3986_parse_path_absolute(uri, &str);
-	if (ret != 0) return(ret);
+        ret = rfc3986_parse_path_absolute(uri, &str);
+        if (ret != 0)
+            return (ret);
     } else if (ISA_PCHAR(str)) {
         ret = rfc3986_parse_path_no_scheme(uri, &str);
-	if (ret != 0) return(ret);
+        if (ret != 0)
+            return (ret);
     } else {
-	/* path-empty is effectively empty */
-	if (uri != NULL) {
+        /* path-empty is effectively empty */
+        if (uri != NULL) {
             g_free(uri->path);
-	    uri->path = NULL;
-	}
+            uri->path = NULL;
+        }
     }
 
     if (*str == '?') {
-	str++;
-	ret = rfc3986_parse_query(uri, &str);
-	if (ret != 0) return(ret);
+        str++;
+        ret = rfc3986_parse_query(uri, &str);
+        if (ret != 0)
+            return (ret);
     }
     if (*str == '#') {
-	str++;
-	ret = rfc3986_parse_fragment(uri, &str);
-	if (ret != 0) return(ret);
+        str++;
+        ret = rfc3986_parse_fragment(uri, &str);
+        if (ret != 0)
+            return (ret);
     }
     if (*str != 0) {
-	uri_clean(uri);
-	return(1);
+        uri_clean(uri);
+        return (1);
     }
-    return(0);
+    return (0);
 }
 
-
 /**
  * rfc3986_parse:
  * @uri:  pointer to an URI structure
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_relative_ref(URI *uri, const char *str) {
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse(URI *uri, const char *str) {
+static int rfc3986_parse(URI *uri, const char *str)
+{
     int ret;
 
     ret = rfc3986_parse_scheme(uri, &str);
-    if (ret != 0) return(ret);
+    if (ret != 0)
+        return (ret);
     if (*str != ':') {
-	return(1);
+        return (1);
     }
     str++;
     ret = rfc3986_parse_hier_part(uri, &str);
-    if (ret != 0) return(ret);
+    if (ret != 0)
+        return (ret);
     if (*str == '?') {
-	str++;
-	ret = rfc3986_parse_query(uri, &str);
-	if (ret != 0) return(ret);
+        str++;
+        ret = rfc3986_parse_query(uri, &str);
+        if (ret != 0)
+            return (ret);
     }
     if (*str == '#') {
-	str++;
-	ret = rfc3986_parse_fragment(uri, &str);
-	if (ret != 0) return(ret);
+        str++;
+        ret = rfc3986_parse_fragment(uri, &str);
+        if (ret != 0)
+            return (ret);
     }
     if (*str != 0) {
-	uri_clean(uri);
-	return(1);
+        uri_clean(uri);
+        return (1);
     }
-    return(0);
+    return (0);
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ rfc3986_parse(URI *uri, const char *str) {
  *
  * Returns 0 or the error code
  */
-static int
-rfc3986_parse_uri_reference(URI *uri, const char *str) {
+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 @@ rfc3986_parse_uri_reference(URI *uri, const char *str) {
      */
     ret = rfc3986_parse(uri, str);
     if (ret != 0) {
-	uri_clean(uri);
+        uri_clean(uri);
         ret = rfc3986_parse_relative_ref(uri, str);
-	if (ret != 0) {
-	    uri_clean(uri);
-	    return(ret);
-	}
+        if (ret != 0) {
+            uri_clean(uri);
+            return (ret);
+        }
     }
-    return(0);
+    return (0);
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ rfc3986_parse_uri_reference(URI *uri, const char *str) {
  *
  * Returns a newly built URI or NULL in case of error
  */
-URI *
-uri_parse(const char *str) {
+URI *uri_parse(const char *str)
+{
     URI *uri;
     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_parse(const char *str) {
  *
  * Returns 0 or the error code
  */
-int
-uri_parse_into(URI *uri, const char *str) {
-    return(rfc3986_parse_uri_reference(uri, str));
+int uri_parse_into(URI *uri, const char *str)
+{
+    return (rfc3986_parse_uri_reference(uri, str));
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ uri_parse_into(URI *uri, const char *str) {
  *
  * Returns a newly built URI or NULL in case of error
  */
-URI *
-uri_parse_raw(const char *str, int raw) {
+URI *uri_parse_raw(const char *str, int raw)
+{
     URI *uri;
     int ret;
 
     if (str == NULL)
-	return(NULL);
+        return (NULL);
     uri = uri_new();
     if (raw) {
         uri->cleanup |= 2;
@@ -XXX,XX +XXX,XX @@ 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);
 }
 
 /************************************************************************
- *									*
- *			Generic URI structure functions			*
- *									*
+ *                                                                      *
+ *                    Generic URI structure functions                   *
+ *                                                                      *
  ************************************************************************/
 
 /**
@@ -XXX,XX +XXX,XX @@ uri_parse_raw(const char *str, int raw) {
  *
  * Returns the new structure or NULL in case of error
  */
-URI *
-uri_new(void) {
+URI *uri_new(void)
+{
     URI *ret;
 
     ret = g_new0(URI, 1);
-    return(ret);
+    return (ret);
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ uri_new(void) {
  * Function to handle properly a reallocation when saving an URI
  * Also imposes some limit on the length of an URI string output
  */
-static char *
-realloc2n(char *ret, int *max) {
+static char *realloc2n(char *ret, int *max)
+{
     char *temp;
     int tmp;
 
     tmp = *max * 2;
     temp = g_realloc(ret, (tmp + 1));
     *max = tmp;
-    return(temp);
+    return (temp);
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ realloc2n(char *ret, int *max) {
  *
  * Returns a new string (to be deallocated by caller)
  */
-char *
-uri_to_string(URI *uri) {
+char *uri_to_string(URI *uri)
+{
     char *ret = NULL;
     char *temp;
     const char *p;
     int len;
     int max;
 
-    if (uri == NULL) return(NULL);
-
+    if (uri == NULL)
+        return (NULL);
 
     max = 80;
     ret = g_malloc(max + 1);
     len = 0;
 
     if (uri->scheme != NULL) {
-	p = uri->scheme;
-	while (*p != 0) {
-	    if (len >= max) {
+        p = uri->scheme;
+        while (*p != 0) {
+            if (len >= max) {
                 temp = realloc2n(ret, &max);
-		ret = temp;
-	    }
-	    ret[len++] = *p++;
-	}
-	if (len >= max) {
+                ret = temp;
+            }
+            ret[len++] = *p++;
+        }
+        if (len >= max) {
             temp = realloc2n(ret, &max);
             ret = temp;
-	}
-	ret[len++] = ':';
+        }
+        ret[len++] = ':';
     }
     if (uri->opaque != NULL) {
-	p = uri->opaque;
-	while (*p != 0) {
-	    if (len + 3 >= max) {
+        p = uri->opaque;
+        while (*p != 0) {
+            if (len + 3 >= max) {
                 temp = realloc2n(ret, &max);
                 ret = temp;
-	    }
-	    if (IS_RESERVED(*(p)) || IS_UNRESERVED(*(p)))
-		ret[len++] = *p++;
-	    else {
-		int val = *(unsigned char *)p++;
-		int hi = val / 0x10, lo = val % 0x10;
-		ret[len++] = '%';
-		ret[len++] = hi + (hi > 9? 'A'-10 : '0');
-		ret[len++] = lo + (lo > 9? 'A'-10 : '0');
-	    }
-	}
+            }
+            if (IS_RESERVED(*(p)) || IS_UNRESERVED(*(p)))
+                ret[len++] = *p++;
+            else {
+                int val = *(unsigned char *)p++;
+                int hi = val / 0x10, lo = val % 0x10;
+                ret[len++] = '%';
+                ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
+                ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
+            }
+        }
     } else {
-	if (uri->server != NULL) {
-	    if (len + 3 >= max) {
+        if (uri->server != NULL) {
+            if (len + 3 >= max) {
                 temp = realloc2n(ret, &max);
                 ret = temp;
-	    }
-	    ret[len++] = '/';
-	    ret[len++] = '/';
-	    if (uri->user != NULL) {
-		p = uri->user;
-		while (*p != 0) {
-		    if (len + 3 >= max) {
+            }
+            ret[len++] = '/';
+            ret[len++] = '/';
+            if (uri->user != NULL) {
+                p = uri->user;
+                while (*p != 0) {
+                    if (len + 3 >= max) {
                         temp = realloc2n(ret, &max);
                         ret = temp;
-		    }
-		    if ((IS_UNRESERVED(*(p))) ||
-			((*(p) == ';')) || ((*(p) == ':')) ||
-			((*(p) == '&')) || ((*(p) == '=')) ||
-			((*(p) == '+')) || ((*(p) == '$')) ||
-			((*(p) == ',')))
-			ret[len++] = *p++;
-		    else {
-			int val = *(unsigned char *)p++;
-			int hi = val / 0x10, lo = val % 0x10;
-			ret[len++] = '%';
-			ret[len++] = hi + (hi > 9? 'A'-10 : '0');
-			ret[len++] = lo + (lo > 9? 'A'-10 : '0');
-		    }
-		}
-		if (len + 3 >= max) {
+                    }
+                    if ((IS_UNRESERVED(*(p))) || ((*(p) == ';')) ||
+                        ((*(p) == ':')) || ((*(p) == '&')) || ((*(p) == '=')) ||
+                        ((*(p) == '+')) || ((*(p) == '$')) || ((*(p) == ',')))
+                        ret[len++] = *p++;
+                    else {
+                        int val = *(unsigned char *)p++;
+                        int hi = val / 0x10, lo = val % 0x10;
+                        ret[len++] = '%';
+                        ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
+                        ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
+                    }
+                }
+                if (len + 3 >= max) {
                     temp = realloc2n(ret, &max);
                     ret = temp;
-		}
-		ret[len++] = '@';
-	    }
-	    p = uri->server;
-	    while (*p != 0) {
-		if (len >= max) {
+                }
+                ret[len++] = '@';
+            }
+            p = uri->server;
+            while (*p != 0) {
+                if (len >= max) {
                     temp = realloc2n(ret, &max);
                     ret = temp;
-		}
-		ret[len++] = *p++;
-	    }
-	    if (uri->port > 0) {
-		if (len + 10 >= max) {
+                }
+                ret[len++] = *p++;
+            }
+            if (uri->port > 0) {
+                if (len + 10 >= max) {
                     temp = realloc2n(ret, &max);
                     ret = temp;
-		}
-		len += snprintf(&ret[len], max - len, ":%d", uri->port);
-	    }
-	} else if (uri->authority != NULL) {
-	    if (len + 3 >= max) {
+                }
+                len += snprintf(&ret[len], max - len, ":%d", uri->port);
+            }
+        } else if (uri->authority != NULL) {
+            if (len + 3 >= max) {
                 temp = realloc2n(ret, &max);
                 ret = temp;
-	    }
-	    ret[len++] = '/';
-	    ret[len++] = '/';
-	    p = uri->authority;
-	    while (*p != 0) {
-		if (len + 3 >= max) {
+            }
+            ret[len++] = '/';
+            ret[len++] = '/';
+            p = uri->authority;
+            while (*p != 0) {
+                if (len + 3 >= max) {
                     temp = realloc2n(ret, &max);
                     ret = temp;
-		}
-		if ((IS_UNRESERVED(*(p))) ||
-                    ((*(p) == '$')) || ((*(p) == ',')) || ((*(p) == ';')) ||
-                    ((*(p) == ':')) || ((*(p) == '@')) || ((*(p) == '&')) ||
-                    ((*(p) == '=')) || ((*(p) == '+')))
-		    ret[len++] = *p++;
-		else {
-		    int val = *(unsigned char *)p++;
-		    int hi = val / 0x10, lo = val % 0x10;
-		    ret[len++] = '%';
-		    ret[len++] = hi + (hi > 9? 'A'-10 : '0');
-		    ret[len++] = lo + (lo > 9? 'A'-10 : '0');
-		}
-	    }
-	} else if (uri->scheme != NULL) {
-	    if (len + 3 >= max) {
+                }
+                if ((IS_UNRESERVED(*(p))) || ((*(p) == '$')) ||
+                    ((*(p) == ',')) || ((*(p) == ';')) || ((*(p) == ':')) ||
+                    ((*(p) == '@')) || ((*(p) == '&')) || ((*(p) == '=')) ||
+                    ((*(p) == '+')))
+                    ret[len++] = *p++;
+                else {
+                    int val = *(unsigned char *)p++;
+                    int hi = val / 0x10, lo = val % 0x10;
+                    ret[len++] = '%';
+                    ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
+                    ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
+                }
+            }
+        } else if (uri->scheme != NULL) {
+            if (len + 3 >= max) {
                 temp = realloc2n(ret, &max);
                 ret = temp;
-	    }
-	    ret[len++] = '/';
-	    ret[len++] = '/';
-	}
-	if (uri->path != NULL) {
-	    p = uri->path;
-	    /*
-	     * the colon in file:///d: should not be escaped or
-	     * Windows accesses fail later.
-	     */
-	    if ((uri->scheme != NULL) &&
-		(p[0] == '/') &&
-		(((p[1] >= 'a') && (p[1] <= 'z')) ||
-		 ((p[1] >= 'A') && (p[1] <= 'Z'))) &&
-		(p[2] == ':') &&
-	        (!strcmp(uri->scheme, "file"))) {
-		if (len + 3 >= max) {
+            }
+            ret[len++] = '/';
+            ret[len++] = '/';
+        }
+        if (uri->path != NULL) {
+            p = uri->path;
+            /*
+             * the colon in file:///d: should not be escaped or
+             * Windows accesses fail later.
+             */
+            if ((uri->scheme != NULL) && (p[0] == '/') &&
+                (((p[1] >= 'a') && (p[1] <= 'z')) ||
+                 ((p[1] >= 'A') && (p[1] <= 'Z'))) &&
+                (p[2] == ':') && (!strcmp(uri->scheme, "file"))) {
+                if (len + 3 >= max) {
                     temp = realloc2n(ret, &max);
                     ret = temp;
-		}
-		ret[len++] = *p++;
-		ret[len++] = *p++;
-		ret[len++] = *p++;
-	    }
-	    while (*p != 0) {
-		if (len + 3 >= max) {
+                }
+                ret[len++] = *p++;
+                ret[len++] = *p++;
+                ret[len++] = *p++;
+            }
+            while (*p != 0) {
+                if (len + 3 >= max) {
                     temp = realloc2n(ret, &max);
                     ret = temp;
-		}
-		if ((IS_UNRESERVED(*(p))) || ((*(p) == '/')) ||
+                }
+                if ((IS_UNRESERVED(*(p))) || ((*(p) == '/')) ||
                     ((*(p) == ';')) || ((*(p) == '@')) || ((*(p) == '&')) ||
-	            ((*(p) == '=')) || ((*(p) == '+')) || ((*(p) == '$')) ||
-	            ((*(p) == ',')))
-		    ret[len++] = *p++;
-		else {
-		    int val = *(unsigned char *)p++;
-		    int hi = val / 0x10, lo = val % 0x10;
-		    ret[len++] = '%';
-		    ret[len++] = hi + (hi > 9? 'A'-10 : '0');
-		    ret[len++] = lo + (lo > 9? 'A'-10 : '0');
-		}
-	    }
-	}
-	if (uri->query != NULL) {
-	    if (len + 1 >= max) {
+                    ((*(p) == '=')) || ((*(p) == '+')) || ((*(p) == '$')) ||
+                    ((*(p) == ',')))
+                    ret[len++] = *p++;
+                else {
+                    int val = *(unsigned char *)p++;
+                    int hi = val / 0x10, lo = val % 0x10;
+                    ret[len++] = '%';
+                    ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
+                    ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
+                }
+            }
+        }
+        if (uri->query != NULL) {
+            if (len + 1 >= max) {
                 temp = realloc2n(ret, &max);
                 ret = temp;
-	    }
-	    ret[len++] = '?';
-	    p = uri->query;
-	    while (*p != 0) {
-		if (len + 1 >= max) {
+            }
+            ret[len++] = '?';
+            p = uri->query;
+            while (*p != 0) {
+                if (len + 1 >= max) {
                     temp = realloc2n(ret, &max);
                     ret = temp;
-		}
-		ret[len++] = *p++;
-	    }
-	}
+                }
+                ret[len++] = *p++;
+            }
+        }
     }
     if (uri->fragment != NULL) {
-	if (len + 3 >= max) {
+        if (len + 3 >= max) {
             temp = realloc2n(ret, &max);
             ret = temp;
-	}
-	ret[len++] = '#';
-	p = uri->fragment;
-	while (*p != 0) {
-	    if (len + 3 >= max) {
+        }
+        ret[len++] = '#';
+        p = uri->fragment;
+        while (*p != 0) {
+            if (len + 3 >= max) {
                 temp = realloc2n(ret, &max);
                 ret = temp;
-	    }
-	    if ((IS_UNRESERVED(*(p))) || (IS_RESERVED(*(p))))
-		ret[len++] = *p++;
-	    else {
-		int val = *(unsigned char *)p++;
-		int hi = val / 0x10, lo = val % 0x10;
-		ret[len++] = '%';
-		ret[len++] = hi + (hi > 9? 'A'-10 : '0');
-		ret[len++] = lo + (lo > 9? 'A'-10 : '0');
-	    }
-	}
+            }
+            if ((IS_UNRESERVED(*(p))) || (IS_RESERVED(*(p))))
+                ret[len++] = *p++;
+            else {
+                int val = *(unsigned char *)p++;
+                int hi = val / 0x10, lo = val % 0x10;
+                ret[len++] = '%';
+                ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
+                ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
+            }
+        }
     }
     if (len >= max) {
         temp = realloc2n(ret, &max);
         ret = temp;
     }
     ret[len] = 0;
-    return(ret);
+    return (ret);
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ uri_to_string(URI *uri) {
  *
  * Make sure the URI struct is free of content
  */
-static void
-uri_clean(URI *uri) {
-    if (uri == NULL) return;
+static void uri_clean(URI *uri)
+{
+    if (uri == NULL)
+        return;
 
     g_free(uri->scheme);
     uri->scheme = NULL;
@@ -XXX,XX +XXX,XX @@ uri_clean(URI *uri) {
  *
  * Free up the URI struct
  */
-void
-uri_free(URI *uri) {
+void uri_free(URI *uri)
+{
     uri_clean(uri);
     g_free(uri);
 }
 
 /************************************************************************
- *									*
- *			Helper functions				*
- *									*
+ *                                                                      *
+ *                           Helper functions                           *
+ *                                                                      *
  ************************************************************************/
 
 /**
@@ -XXX,XX +XXX,XX @@ uri_free(URI *uri) {
  *
  * Returns 0 or an error code
  */
-static int
-normalize_uri_path(char *path) {
+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.
      */
     cur = path;
     while (cur[0] == '/')
-      ++cur;
+        ++cur;
     if (cur[0] == '\0')
-      return(0);
+        return (0);
 
     /* Keep everything we've seen so far.  */
     out = cur;
@@ -XXX,XX +XXX,XX @@ normalize_uri_path(char *path) {
      * Analyze each segment in sequence for cases (c) and (d).
      */
     while (cur[0] != '\0') {
-	/*
-	 * c) All occurrences of "./", where "." is a complete path segment,
-	 *    are removed from the buffer string.
-	 */
-	if ((cur[0] == '.') && (cur[1] == '/')) {
-	    cur += 2;
-	    /* '//' normalization should be done at this point too */
-	    while (cur[0] == '/')
-		cur++;
-	    continue;
-	}
+        /*
+         * c) All occurrences of "./", where "." is a complete path segment,
+         *    are removed from the buffer string.
+         */
+        if ((cur[0] == '.') && (cur[1] == '/')) {
+            cur += 2;
+            /* '//' normalization should be done at this point too */
+            while (cur[0] == '/')
+                cur++;
+            continue;
+        }
 
-	/*
-	 * d) If the buffer string ends with "." as a complete path segment,
-	 *    that "." is removed.
-	 */
-	if ((cur[0] == '.') && (cur[1] == '\0'))
-	    break;
+        /*
+         * d) If the buffer string ends with "." as a complete path segment,
+         *    that "." is removed.
+         */
+        if ((cur[0] == '.') && (cur[1] == '\0'))
+            break;
 
-	/* Otherwise keep the segment.  */
-	while (cur[0] != '/') {
+        /* Otherwise keep the segment.  */
+        while (cur[0] != '/') {
             if (cur[0] == '\0')
-              goto done_cd;
-	    (out++)[0] = (cur++)[0];
-	}
-	/* nomalize // */
-	while ((cur[0] == '/') && (cur[1] == '/'))
-	    cur++;
+                goto done_cd;
+            (out++)[0] = (cur++)[0];
+        }
+        /* nomalize // */
+        while ((cur[0] == '/') && (cur[1] == '/'))
+            cur++;
 
         (out++)[0] = (cur++)[0];
     }
- done_cd:
+done_cd:
     out[0] = '\0';
 
     /* Reset to the beginning of the first segment for the next sequence.  */
     cur = path;
     while (cur[0] == '/')
-      ++cur;
+        ++cur;
     if (cur[0] == '\0')
-	return(0);
+        return (0);
 
     /*
      * Analyze each segment in sequence for cases (e) and (f).
@@ -XXX,XX +XXX,XX @@ normalize_uri_path(char *path) {
         /* Find the end of the current segment.  */
         segp = cur;
         while ((segp[0] != '/') && (segp[0] != '\0'))
-          ++segp;
+            ++segp;
 
         /* If this is the last segment, we're done (we need at least two
          * segments to meet the criteria for the (e) and (f) cases).
          */
         if (segp[0] == '\0')
-          break;
+            break;
 
         /* If the first segment is "..", or if the next segment _isn't_ "..",
          * keep this segment and try the next one.
          */
         ++segp;
-        if (((cur[0] == '.') && (cur[1] == '.') && (segp == cur+3))
-            || ((segp[0] != '.') || (segp[1] != '.')
-                || ((segp[2] != '/') && (segp[2] != '\0')))) {
-          cur = segp;
-          continue;
+        if (((cur[0] == '.') && (cur[1] == '.') && (segp == cur + 3)) ||
+            ((segp[0] != '.') || (segp[1] != '.') ||
+             ((segp[2] != '/') && (segp[2] != '\0')))) {
+            cur = segp;
+            continue;
         }
 
         /* If we get here, remove this segment and the next one and back up
@@ -XXX,XX +XXX,XX @@ normalize_uri_path(char *path) {
 
         /* If this is the end of the buffer, we're done.  */
         if (segp[2] == '\0') {
-          cur[0] = '\0';
-          break;
+            cur[0] = '\0';
+            break;
         }
         /* Valgrind complained, strcpy(cur, segp + 3); */
         /* string will overlap, do not use strcpy */
         tmp = cur;
         segp += 3;
         while ((*tmp++ = *segp++) != 0)
-          ;
+            ;
 
         /* If there are no previous segments, then keep going from here.  */
         segp = cur;
         while ((segp > path) && ((--segp)[0] == '/'))
-          ;
+            ;
         if (segp == path)
-          continue;
+            continue;
 
         /* "segp" is pointing to the end of a previous segment; find it's
          * start.  We need to back up to the previous segment and start
@@ -XXX,XX +XXX,XX @@ normalize_uri_path(char *path) {
          */
         cur = segp;
         while ((cur > path) && (cur[-1] != '/'))
-          --cur;
+            --cur;
     }
     out[0] = '\0';
 
@@ -XXX,XX +XXX,XX @@ normalize_uri_path(char *path) {
      * We discard them from the final path.
      */
     if (path[0] == '/') {
-      cur = path;
-      while ((cur[0] == '/') && (cur[1] == '.') && (cur[2] == '.')
-             && ((cur[3] == '/') || (cur[3] == '\0')))
-	cur += 3;
+        cur = path;
+        while ((cur[0] == '/') && (cur[1] == '.') && (cur[2] == '.') &&
+               ((cur[3] == '/') || (cur[3] == '\0')))
+            cur += 3;
 
-      if (cur != path) {
-	out = path;
-	while (cur[0] != '\0')
-          (out++)[0] = (cur++)[0];
-	out[0] = 0;
-      }
+        if (cur != path) {
+            out = path;
+            while (cur[0] != '\0')
+                (out++)[0] = (cur++)[0];
+            out[0] = 0;
+        }
     }
 
-    return(0);
+    return (0);
 }
 
-static int is_hex(char c) {
-    if (((c >= '0') && (c <= '9')) ||
-        ((c >= 'a') && (c <= 'f')) ||
+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);
 }
 
-
 /**
  * uri_string_unescape:
  * @str:  the string to unescape
@@ -XXX,XX +XXX,XX @@ static int is_hex(char c) {
  * Returns a copy of the string, but unescaped, will return NULL only in case
  * of error
  */
-char *
-uri_string_unescape(const char *str, int len, char *target) {
+char *uri_string_unescape(const char *str, int len, char *target)
+{
     char *ret, *out;
     const char *in;
 
     if (str == NULL)
-	return(NULL);
-    if (len <= 0) len = strlen(str);
-    if (len < 0) return(NULL);
+        return (NULL);
+    if (len <= 0)
+        len = strlen(str);
+    if (len < 0)
+        return (NULL);
 
     if (target == NULL) {
-	ret = g_malloc(len + 1);
+        ret = g_malloc(len + 1);
     } else
-	ret = target;
+        ret = target;
     in = str;
     out = ret;
-    while(len > 0) {
-	if ((len > 2) && (*in == '%') && (is_hex(in[1])) && (is_hex(in[2]))) {
-	    in++;
-	    if ((*in >= '0') && (*in <= '9'))
-	        *out = (*in - '0');
-	    else if ((*in >= 'a') && (*in <= 'f'))
-	        *out = (*in - 'a') + 10;
-	    else if ((*in >= 'A') && (*in <= 'F'))
-	        *out = (*in - 'A') + 10;
-	    in++;
-	    if ((*in >= '0') && (*in <= '9'))
-	        *out = *out * 16 + (*in - '0');
-	    else if ((*in >= 'a') && (*in <= 'f'))
-	        *out = *out * 16 + (*in - 'a') + 10;
-	    else if ((*in >= 'A') && (*in <= 'F'))
-	        *out = *out * 16 + (*in - 'A') + 10;
-	    in++;
-	    len -= 3;
-	    out++;
-	} else {
-	    *out++ = *in++;
-	    len--;
-	}
+    while (len > 0) {
+        if ((len > 2) && (*in == '%') && (is_hex(in[1])) && (is_hex(in[2]))) {
+            in++;
+            if ((*in >= '0') && (*in <= '9'))
+                *out = (*in - '0');
+            else if ((*in >= 'a') && (*in <= 'f'))
+                *out = (*in - 'a') + 10;
+            else if ((*in >= 'A') && (*in <= 'F'))
+                *out = (*in - 'A') + 10;
+            in++;
+            if ((*in >= '0') && (*in <= '9'))
+                *out = *out * 16 + (*in - '0');
+            else if ((*in >= 'a') && (*in <= 'f'))
+                *out = *out * 16 + (*in - 'a') + 10;
+            else if ((*in >= 'A') && (*in <= 'F'))
+                *out = *out * 16 + (*in - 'A') + 10;
+            in++;
+            len -= 3;
+            out++;
+        } else {
+            *out++ = *in++;
+            len--;
+        }
     }
     *out = 0;
-    return(ret);
+    return (ret);
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ uri_string_unescape(const char *str, int len, char *target) {
  *
  * Returns a new escaped string or NULL in case of error.
  */
-char *
-uri_string_escape(const char *str, const char *list) {
+char *uri_string_escape(const char *str, const char *list)
+{
     char *ret, ch;
     char *temp;
     const char *in;
     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);
+    if (!(len > 0))
+        return (NULL);
 
     len += 20;
     ret = g_malloc(len);
     in = str;
     out = 0;
-    while(*in != 0) {
-	if (len - out <= 3) {
+    while (*in != 0) {
+        if (len - out <= 3) {
             temp = realloc2n(ret, &len);
-	    ret = temp;
-	}
+            ret = temp;
+        }
 
-	ch = *in;
-
-	if ((ch != '@') && (!IS_UNRESERVED(ch)) && (!strchr(list, ch))) {
-	    unsigned char val;
-	    ret[out++] = '%';
-	    val = ch >> 4;
-	    if (val <= 9)
-		ret[out++] = '0' + val;
-	    else
-		ret[out++] = 'A' + val - 0xA;
-	    val = ch & 0xF;
-	    if (val <= 9)
-		ret[out++] = '0' + val;
-	    else
-		ret[out++] = 'A' + val - 0xA;
-	    in++;
-	} else {
-	    ret[out++] = *in++;
-	}
+        ch = *in;
 
+        if ((ch != '@') && (!IS_UNRESERVED(ch)) && (!strchr(list, ch))) {
+            unsigned char val;
+            ret[out++] = '%';
+            val = ch >> 4;
+            if (val <= 9)
+                ret[out++] = '0' + val;
+            else
+                ret[out++] = 'A' + val - 0xA;
+            val = ch & 0xF;
+            if (val <= 9)
+                ret[out++] = '0' + val;
+            else
+                ret[out++] = 'A' + val - 0xA;
+            in++;
+        } else {
+            ret[out++] = *in++;
+        }
     }
     ret[out] = 0;
-    return(ret);
+    return (ret);
 }
 
 /************************************************************************
- *									*
- *			Public functions				*
- *									*
+ *                                                                      *
+ *                           Public functions                           *
+ *                                                                      *
  ************************************************************************/
 
 /**
@@ -XXX,XX +XXX,XX @@ uri_string_escape(const char *str, const char *list) {
  * Returns a new URI string (to be freed by the caller) or NULL in case
  *         of error.
  */
-char *
-uri_resolve(const char *uri, const char *base) {
+char *uri_resolve(const char *uri, const char *base)
+{
     char *val = NULL;
     int ret, len, indx, cur, out;
     URI *ref = NULL;
@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
      *    URI.  Should we do that here?
      */
     if (uri == NULL)
-	ret = -1;
+        ret = -1;
     else {
-	if (*uri) {
-	    ref = uri_new();
-	    ret = uri_parse_into(ref, uri);
-	}
-	else
-	    ret = 0;
+        if (*uri) {
+            ref = uri_new();
+            ret = uri_parse_into(ref, uri);
+        } else
+            ret = 0;
     }
     if (ret != 0)
-	goto done;
+        goto done;
     if ((ref != NULL) && (ref->scheme != NULL)) {
-	/*
-	 * The URI is absolute don't modify.
-	 */
-	val = g_strdup(uri);
-	goto done;
+        /*
+         * The URI is absolute don't modify.
+         */
+        val = g_strdup(uri);
+        goto done;
     }
     if (base == NULL)
-	ret = -1;
+        ret = -1;
     else {
-	bas = uri_new();
-	ret = uri_parse_into(bas, base);
+        bas = uri_new();
+        ret = uri_parse_into(bas, base);
     }
     if (ret != 0) {
-	if (ref)
-	    val = uri_to_string(ref);
-	goto done;
+        if (ref)
+            val = uri_to_string(ref);
+        goto done;
     }
     if (ref == NULL) {
-	/*
-	 * the base fragment must be ignored
-	 */
+        /*
+         * the base fragment must be ignored
+         */
         g_free(bas->fragment);
         bas->fragment = NULL;
-	val = uri_to_string(bas);
-	goto done;
+        val = uri_to_string(bas);
+        goto done;
     }
 
     /*
@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
      */
     res = uri_new();
     if ((ref->scheme == NULL) && (ref->path == NULL) &&
-	((ref->authority == NULL) && (ref->server == NULL))) {
+        ((ref->authority == NULL) && (ref->server == NULL))) {
         res->scheme = g_strdup(bas->scheme);
-	if (bas->authority != NULL)
-	    res->authority = g_strdup(bas->authority);
-	else if (bas->server != NULL) {
+        if (bas->authority != NULL)
+            res->authority = g_strdup(bas->authority);
+        else if (bas->server != NULL) {
             res->server = g_strdup(bas->server);
             res->user = g_strdup(bas->user);
             res->port = bas->port;
-	}
+        }
         res->path = g_strdup(bas->path);
         if (ref->query != NULL) {
-	    res->query = g_strdup (ref->query);
+            res->query = g_strdup(ref->query);
         } else {
             res->query = g_strdup(bas->query);
         }
         res->fragment = g_strdup(ref->fragment);
-	goto step_7;
+        goto step_7;
     }
 
     /*
@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
      *    scheme is inherited from the base URI's scheme component.
      */
     if (ref->scheme != NULL) {
-	val = uri_to_string(ref);
-	goto done;
+        val = uri_to_string(ref);
+        goto done;
     }
     res->scheme = g_strdup(bas->scheme);
 
@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
      *    use an authority component.
      */
     if ((ref->authority != NULL) || (ref->server != NULL)) {
-	if (ref->authority != NULL)
-	    res->authority = g_strdup(ref->authority);
-	else {
-	    res->server = g_strdup(ref->server);
+        if (ref->authority != NULL)
+            res->authority = g_strdup(ref->authority);
+        else {
+            res->server = g_strdup(ref->server);
             res->user = g_strdup(ref->user);
             res->port = ref->port;
-	}
+        }
         res->path = g_strdup(ref->path);
-	goto step_7;
+        goto step_7;
     }
     if (bas->authority != NULL)
-	res->authority = g_strdup(bas->authority);
+        res->authority = g_strdup(bas->authority);
     else if (bas->server != NULL) {
         res->server = g_strdup(bas->server);
         res->user = g_strdup(bas->user);
-	res->port = bas->port;
+        res->port = bas->port;
     }
 
     /*
@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
      *    the reference is an absolute-path and we skip to step 7.
      */
     if ((ref->path != NULL) && (ref->path[0] == '/')) {
-	res->path = g_strdup(ref->path);
-	goto step_7;
+        res->path = g_strdup(ref->path);
+        goto step_7;
     }
 
-
     /*
      * 6) If this step is reached, then we are resolving a relative-path
      *    reference.  The relative path needs to be merged with the base
@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
      */
     len = 2; /* extra / and 0 */
     if (ref->path != NULL)
-	len += strlen(ref->path);
+        len += strlen(ref->path);
     if (bas->path != NULL)
-	len += strlen(bas->path);
+        len += strlen(bas->path);
     res->path = g_malloc(len);
     res->path[0] = 0;
 
@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
     cur = 0;
     out = 0;
     if (bas->path != NULL) {
-	while (bas->path[cur] != 0) {
-	    while ((bas->path[cur] != 0) && (bas->path[cur] != '/'))
-		cur++;
-	    if (bas->path[cur] == 0)
-		break;
+        while (bas->path[cur] != 0) {
+            while ((bas->path[cur] != 0) && (bas->path[cur] != '/'))
+                cur++;
+            if (bas->path[cur] == 0)
+                break;
 
-	    cur++;
-	    while (out < cur) {
-		res->path[out] = bas->path[out];
-		out++;
-	    }
-	}
+            cur++;
+            while (out < cur) {
+                res->path[out] = bas->path[out];
+                out++;
+            }
+        }
     }
     res->path[out] = 0;
 
@@ -XXX,XX +XXX,XX @@ uri_resolve(const char *uri, const char *base) {
      *    string.
      */
     if (ref->path != NULL && ref->path[0] != 0) {
-	indx = 0;
-	/*
-	 * Ensure the path includes a '/'
-	 */
-	if ((out == 0) && (bas->server != NULL))
-	    res->path[out++] = '/';
-	while (ref->path[indx] != 0) {
-	    res->path[out++] = ref->path[indx++];
-	}
+        indx = 0;
+        /*
+         * Ensure the path includes a '/'
+         */
+        if ((out == 0) && (bas->server != NULL))
+            res->path[out++] = '/';
+        while (ref->path[indx] != 0) {
+            res->path[out++] = ref->path[indx++];
+        }
     }
     res->path[out] = 0;
 
@@ -XXX,XX +XXX,XX @@ step_7:
 
 done:
     if (ref != NULL)
-	uri_free(ref);
+        uri_free(ref);
     if (bas != NULL)
-	uri_free(bas);
+        uri_free(bas);
     if (res != NULL)
-	uri_free(res);
-    return(val);
+        uri_free(res);
+    return (val);
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ done:
  * Returns a new URI string (to be freed by the caller) or NULL in case
  * error.
  */
-char *
-uri_resolve_relative (const char *uri, const char * base)
+char *uri_resolve_relative(const char *uri, const char *base)
 {
     char *val = NULL;
     int ret;
@@ -XXX,XX +XXX,XX @@ uri_resolve_relative (const char *uri, const char * base)
     int remove_path = 0;
 
     if ((uri == NULL) || (*uri == 0))
-	return NULL;
+        return NULL;
 
     /*
      * First parse URI into a standard form
      */
-    ref = uri_new ();
+    ref = uri_new();
     /* If URI not already in "relative" form */
     if (uri[0] != '.') {
-	ret = uri_parse_into (ref, uri);
-	if (ret != 0)
-	    goto done;		/* Error in URI, return NULL */
+        ret = uri_parse_into(ref, uri);
+        if (ret != 0)
+            goto done; /* Error in URI, return NULL */
     } else
-	ref->path = g_strdup(uri);
+        ref->path = g_strdup(uri);
 
     /*
      * Next parse base into the same standard form
      */
     if ((base == NULL) || (*base == 0)) {
-	val = g_strdup (uri);
-	goto done;
+        val = g_strdup(uri);
+        goto done;
     }
-    bas = uri_new ();
+    bas = uri_new();
     if (base[0] != '.') {
-	ret = uri_parse_into (bas, base);
-	if (ret != 0)
-	    goto done;		/* Error in base, return NULL */
+        ret = uri_parse_into(bas, base);
+        if (ret != 0)
+            goto done; /* Error in base, return NULL */
     } else
-	bas->path = g_strdup(base);
+        bas->path = g_strdup(base);
 
     /*
      * If the scheme / server on the URI differs from the base,
      * just return the URI
      */
     if ((ref->scheme != NULL) &&
-	((bas->scheme == NULL) ||
-	 (strcmp (bas->scheme, ref->scheme)) ||
-	 (strcmp (bas->server, ref->server)))) {
-	val = g_strdup (uri);
-	goto done;
+        ((bas->scheme == NULL) || (strcmp(bas->scheme, ref->scheme)) ||
+         (strcmp(bas->server, ref->server)))) {
+        val = g_strdup(uri);
+        goto done;
     }
     if (bas->path == ref->path ||
         (bas->path && ref->path && !strcmp(bas->path, ref->path))) {
-	val = g_strdup("");
-	goto done;
+        val = g_strdup("");
+        goto done;
     }
     if (bas->path == NULL) {
-	val = g_strdup(ref->path);
-	goto done;
+        val = g_strdup(ref->path);
+        goto done;
     }
     if (ref->path == NULL) {
-        ref->path = (char *) "/";
-	remove_path = 1;
+        ref->path = (char *)"/";
+        remove_path = 1;
     }
 
     /*
@@ -XXX,XX +XXX,XX @@ uri_resolve_relative (const char *uri, const char * base)
      * two path components may be missing (bug 316224)
      */
     if (bas->path == NULL) {
-	if (ref->path != NULL) {
-	    uptr = ref->path;
-	    if (*uptr == '/')
-		uptr++;
-	    /* exception characters from uri_to_string */
-	    val = uri_string_escape(uptr, "/;&=+$,");
-	}
-	goto done;
+        if (ref->path != NULL) {
+            uptr = ref->path;
+            if (*uptr == '/')
+                uptr++;
+            /* exception characters from uri_to_string */
+            val = uri_string_escape(uptr, "/;&=+$,");
+        }
+        goto done;
     }
     bptr = bas->path;
     if (ref->path == NULL) {
-	for (ix = 0; bptr[ix] != 0; ix++) {
-	    if (bptr[ix] == '/')
-		nbslash++;
-	}
-	uptr = NULL;
-	len = 1;	/* this is for a string terminator only */
+        for (ix = 0; bptr[ix] != 0; ix++) {
+            if (bptr[ix] == '/')
+                nbslash++;
+        }
+        uptr = NULL;
+        len = 1; /* this is for a string terminator only */
     } else {
-    /*
-     * Next we compare the two strings and find where they first differ
-     */
-	if ((ref->path[pos] == '.') && (ref->path[pos+1] == '/'))
+        /*
+         * Next we compare the two strings and find where they first differ
+         */
+        if ((ref->path[pos] == '.') && (ref->path[pos + 1] == '/'))
             pos += 2;
-	if ((*bptr == '.') && (bptr[1] == '/'))
+        if ((*bptr == '.') && (bptr[1] == '/'))
             bptr += 2;
-	else if ((*bptr == '/') && (ref->path[pos] != '/'))
-	    bptr++;
-	while ((bptr[pos] == ref->path[pos]) && (bptr[pos] != 0))
-	    pos++;
+        else if ((*bptr == '/') && (ref->path[pos] != '/'))
+            bptr++;
+        while ((bptr[pos] == ref->path[pos]) && (bptr[pos] != 0))
+            pos++;
 
-	if (bptr[pos] == ref->path[pos]) {
-	    val = g_strdup("");
-	    goto done;		/* (I can't imagine why anyone would do this) */
-	}
+        if (bptr[pos] == ref->path[pos]) {
+            val = g_strdup("");
+            goto done; /* (I can't imagine why anyone would do this) */
+        }
 
-	/*
-	 * In URI, "back up" to the last '/' encountered.  This will be the
-	 * beginning of the "unique" suffix of URI
-	 */
-	ix = pos;
-	if ((ref->path[ix] == '/') && (ix > 0))
-	    ix--;
-	else if ((ref->path[ix] == 0) && (ix > 1) && (ref->path[ix - 1] == '/'))
-	    ix -= 2;
-	for (; ix > 0; ix--) {
-	    if (ref->path[ix] == '/')
-		break;
-	}
-	if (ix == 0) {
-	    uptr = ref->path;
-	} else {
-	    ix++;
-	    uptr = &ref->path[ix];
-	}
+        /*
+         * In URI, "back up" to the last '/' encountered.  This will be the
+         * beginning of the "unique" suffix of URI
+         */
+        ix = pos;
+        if ((ref->path[ix] == '/') && (ix > 0))
+            ix--;
+        else if ((ref->path[ix] == 0) && (ix > 1) && (ref->path[ix - 1] == '/'))
+            ix -= 2;
+        for (; ix > 0; ix--) {
+            if (ref->path[ix] == '/')
+                break;
+        }
+        if (ix == 0) {
+            uptr = ref->path;
+        } else {
+            ix++;
+            uptr = &ref->path[ix];
+        }
 
-	/*
-	 * In base, count the number of '/' from the differing point
-	 */
-	if (bptr[pos] != ref->path[pos]) {/* check for trivial URI == base */
-	    for (; bptr[ix] != 0; ix++) {
-		if (bptr[ix] == '/')
-		    nbslash++;
-	    }
-	}
-	len = strlen (uptr) + 1;
+        /*
+         * In base, count the number of '/' from the differing point
+         */
+        if (bptr[pos] != ref->path[pos]) { /* check for trivial URI == base */
+            for (; bptr[ix] != 0; ix++) {
+                if (bptr[ix] == '/')
+                    nbslash++;
+            }
+        }
+        len = strlen(uptr) + 1;
     }
 
     if (nbslash == 0) {
-	if (uptr != NULL)
-	    /* exception characters from uri_to_string */
-	    val = uri_string_escape(uptr, "/;&=+$,");
-	goto done;
+        if (uptr != NULL)
+            /* exception characters from uri_to_string */
+            val = uri_string_escape(uptr, "/;&=+$,");
+        goto done;
     }
 
     /*
@@ -XXX,XX +XXX,XX @@ uri_resolve_relative (const char *uri, const char * base)
      * length of the remainder of the URI, plus enough space
      * for the "../" groups, plus one for the terminator
      */
-    val = g_malloc (len + 3 * nbslash);
+    val = g_malloc(len + 3 * nbslash);
     vptr = val;
     /*
      * Put in as many "../" as needed
      */
-    for (; nbslash>0; nbslash--) {
-	*vptr++ = '.';
-	*vptr++ = '.';
-	*vptr++ = '/';
+    for (; nbslash > 0; nbslash--) {
+        *vptr++ = '.';
+        *vptr++ = '.';
+        *vptr++ = '/';
     }
     /*
      * Finish up with the end of the URI
      */
     if (uptr != NULL) {
-        if ((vptr > val) && (len > 0) &&
-	    (uptr[0] == '/') && (vptr[-1] == '/')) {
-	    memcpy (vptr, uptr + 1, len - 1);
-	    vptr[len - 2] = 0;
-	} else {
-	    memcpy (vptr, uptr, len);
-	    vptr[len - 1] = 0;
-	}
+        if ((vptr > val) && (len > 0) && (uptr[0] == '/') &&
+            (vptr[-1] == '/')) {
+            memcpy(vptr, uptr + 1, len - 1);
+            vptr[len - 2] = 0;
+        } else {
+            memcpy(vptr, uptr, len);
+            vptr[len - 1] = 0;
+        }
     } else {
-	vptr[len - 1] = 0;
+        vptr[len - 1] = 0;
     }
 
     /* escape the freshly-built path */
     vptr = val;
-	/* exception characters from uri_to_string */
+    /* exception characters from uri_to_string */
     val = uri_string_escape(vptr, "/;&=+$,");
     g_free(vptr);
 
@@ -XXX,XX +XXX,XX @@ done:
     if (remove_path != 0)
         ref->path = NULL;
     if (ref != NULL)
-	uri_free (ref);
+        uri_free(ref);
     if (bas != NULL)
-	uri_free (bas);
+        uri_free(bas);
 
     return val;
 }
@@ -XXX,XX +XXX,XX @@ done:
  * Utility functions to help parse and assemble query strings.
  */
 
-struct QueryParams *
-query_params_new (int init_alloc)
+struct QueryParams *query_params_new(int init_alloc)
 {
     struct QueryParams *ps;
 
-    if (init_alloc <= 0) init_alloc = 1;
+    if (init_alloc <= 0)
+        init_alloc = 1;
 
     ps = g_new(QueryParams, 1);
     ps->n = 0;
@@ -XXX,XX +XXX,XX @@ query_params_new (int init_alloc)
 /* Ensure there is space to store at least one more parameter
  * at the end of the set.
  */
-static int
-query_params_append (struct QueryParams *ps,
-               const char *name, const char *value)
+static int query_params_append(struct QueryParams *ps, const char *name,
+                               const char *value)
 {
     if (ps->n >= ps->alloc) {
         ps->p = g_renew(QueryParam, ps->p, ps->alloc * 2);
@@ -XXX,XX +XXX,XX @@ query_params_append (struct QueryParams *ps,
     return 0;
 }
 
-void
-query_params_free (struct QueryParams *ps)
+void query_params_free(struct QueryParams *ps)
 {
     int i;
 
     for (i = 0; i < ps->n; ++i) {
-        g_free (ps->p[i].name);
-        g_free (ps->p[i].value);
+        g_free(ps->p[i].name);
+        g_free(ps->p[i].value);
     }
-    g_free (ps->p);
-    g_free (ps);
+    g_free(ps->p);
+    g_free(ps);
 }
 
-struct QueryParams *
-query_params_parse (const char *query)
+struct QueryParams *query_params_parse(const char *query)
 {
     struct QueryParams *ps;
     const char *end, *eq;
 
-    ps = query_params_new (0);
-    if (!query || query[0] == '\0') return ps;
+    ps = query_params_new(0);
+    if (!query || query[0] == '\0')
+        return ps;
 
     while (*query) {
         char *name = NULL, *value = NULL;
 
         /* Find the next separator, or end of the string. */
-        end = strchr (query, '&');
+        end = strchr(query, '&');
         if (!end)
-            end = strchr (query, ';');
+            end = strchr(query, ';');
         if (!end)
-            end = query + strlen (query);
+            end = query + strlen(query);
 
         /* Find the first '=' character between here and end. */
-        eq = strchr (query, '=');
-        if (eq && eq >= end) eq = NULL;
+        eq = strchr(query, '=');
+        if (eq && eq >= end)
+            eq = NULL;
 
         /* Empty section (eg. "&&"). */
         if (end == query)
@@ -XXX,XX +XXX,XX @@ query_params_parse (const char *query)
          * and consistent with CGI.pm we assume value is "".
          */
         else if (!eq) {
-            name = uri_string_unescape (query, end - query, NULL);
+            name = uri_string_unescape(query, end - query, NULL);
             value = NULL;
         }
         /* Or if we have "name=" here (works around annoying
          * problem when calling uri_string_unescape with len = 0).
          */
-        else if (eq+1 == end) {
-            name = uri_string_unescape (query, eq - query, NULL);
+        else if (eq + 1 == end) {
+            name = uri_string_unescape(query, eq - query, NULL);
             value = g_new0(char, 1);
         }
         /* If the '=' character is at the beginning then we have
@@ -XXX,XX +XXX,XX @@ query_params_parse (const char *query)
 
         /* Otherwise it's "name=value". */
         else {
-            name = uri_string_unescape (query, eq - query, NULL);
-            value = uri_string_unescape (eq+1, end - (eq+1), NULL);
+            name = uri_string_unescape(query, eq - query, NULL);
+            value = uri_string_unescape(eq + 1, end - (eq + 1), NULL);
         }
 
         /* Append to the parameter set. */
-        query_params_append (ps, name, value);
+        query_params_append(ps, name, value);
         g_free(name);
         g_free(value);
 
     next:
         query = end;
-        if (*query) query ++; /* skip '&' separator */
+        if (*query)
+            query++; /* skip '&' separator */
     }
 
     return ps;
-- 
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(-)

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
index XXXXXXX..XXXXXXX 100644
--- 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
+        } else {
             uri->fragment = uri_string_unescape(*str, cur - *str, NULL);
+        }
     }
     *str = cur;
     return 0;
@@ -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
      */
     if (ISA_DIGIT(cur)) {
-        if (rfc3986_parse_dec_octet(&cur) != 0)
+        if (rfc3986_parse_dec_octet(&cur) != 0) {
             goto not_ipv4;
-        if (*cur != '.')
+        }
+        if (*cur != '.') {
             goto not_ipv4;
+        }
         cur++;
-        if (rfc3986_parse_dec_octet(&cur) != 0)
+        if (rfc3986_parse_dec_octet(&cur) != 0) {
             goto not_ipv4;
-        if (*cur != '.')
+        }
+        if (*cur != '.') {
             goto not_ipv4;
-        if (rfc3986_parse_dec_octet(&cur) != 0)
+        }
+        if (rfc3986_parse_dec_octet(&cur) != 0) {
             goto not_ipv4;
-        if (*cur != '.')
+        }
+        if (*cur != '.') {
             goto not_ipv4;
-        if (rfc3986_parse_dec_octet(&cur) != 0)
+        }
+        if (rfc3986_parse_dec_octet(&cur) != 0) {
             goto not_ipv4;
+        }
         goto found;
     not_ipv4:
         cur = *str;
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_host(URI *uri, const char **str)
     /*
      * then this should be a hostname which can be empty
      */
-    while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cur))
+    while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cur)) {
         NEXT(cur);
+    }
 found:
     if (uri != NULL) {
         g_free(uri->authority);
         uri->authority = NULL;
         g_free(uri->server);
         if (cur != host) {
-            if (uri->cleanup & 2)
+            if (uri->cleanup & 2) {
                 uri->server = g_strndup(host, cur - host);
-            else
+            } else {
                 uri->server = uri_string_unescape(host, cur - host, NULL);
-        } else
+            }
+        } else {
             uri->server = NULL;
+        }
     }
     *str = cur;
     return 0;
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_authority(URI *uri, const char **str)
      * try to parse a userinfo and check for the trailing @
      */
     ret = rfc3986_parse_user_info(uri, &cur);
-    if ((ret != 0) || (*cur != '@'))
+    if ((ret != 0) || (*cur != '@')) {
         cur = *str;
-    else
+    } else {
         cur++;
+    }
     ret = rfc3986_parse_host(uri, &cur);
-    if (ret != 0)
+    if (ret != 0) {
         return ret;
+    }
     if (*cur == ':') {
         cur++;
         ret = rfc3986_parse_port(uri, &cur);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
     }
     *str = cur;
     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)
+        if (empty) {
             return 0;
+        }
         return 1;
     }
-    while (ISA_PCHAR(cur) && (*cur != forbid))
+    while (ISA_PCHAR(cur) && (*cur != forbid)) {
         NEXT(cur);
+    }
     *str = cur;
     return 0;
 }
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_ab_empty(URI *uri, const char **str)
     while (*cur == '/') {
         cur++;
         ret = rfc3986_parse_segment(&cur, 0, 1);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
     }
     if (uri != NULL) {
         g_free(uri->path);
         if (*str != cur) {
-            if (uri->cleanup & 2)
+            if (uri->cleanup & 2) {
                 uri->path = g_strndup(*str, cur - *str);
-            else
+            } else {
                 uri->path = uri_string_unescape(*str, cur - *str, NULL);
+            }
         } else {
             uri->path = NULL;
         }
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_absolute(URI *uri, const char **str)
 
     cur = *str;
 
-    if (*cur != '/')
+    if (*cur != '/') {
         return 1;
+    }
     cur++;
     ret = rfc3986_parse_segment(&cur, 0, 0);
     if (ret == 0) {
         while (*cur == '/') {
             cur++;
             ret = rfc3986_parse_segment(&cur, 0, 1);
-            if (ret != 0)
+            if (ret != 0) {
                 return ret;
+            }
         }
     }
     if (uri != NULL) {
         g_free(uri->path);
         if (cur != *str) {
-            if (uri->cleanup & 2)
+            if (uri->cleanup & 2) {
                 uri->path = g_strndup(*str, cur - *str);
-            else
+            } else {
                 uri->path = uri_string_unescape(*str, cur - *str, NULL);
+            }
         } else {
             uri->path = NULL;
         }
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_rootless(URI *uri, const char **str)
     cur = *str;
 
     ret = rfc3986_parse_segment(&cur, 0, 0);
-    if (ret != 0)
+    if (ret != 0) {
         return ret;
+    }
     while (*cur == '/') {
         cur++;
         ret = rfc3986_parse_segment(&cur, 0, 1);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
     }
     if (uri != NULL) {
         g_free(uri->path);
         if (cur != *str) {
-            if (uri->cleanup & 2)
+            if (uri->cleanup & 2) {
                 uri->path = g_strndup(*str, cur - *str);
-            else
+            } else {
                 uri->path = uri_string_unescape(*str, cur - *str, NULL);
+            }
         } else {
             uri->path = NULL;
         }
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_path_no_scheme(URI *uri, const char **str)
     cur = *str;
 
     ret = rfc3986_parse_segment(&cur, ':', 0);
-    if (ret != 0)
+    if (ret != 0) {
         return ret;
+    }
     while (*cur == '/') {
         cur++;
         ret = rfc3986_parse_segment(&cur, 0, 1);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
     }
     if (uri != NULL) {
         g_free(uri->path);
         if (cur != *str) {
-            if (uri->cleanup & 2)
+            if (uri->cleanup & 2) {
                 uri->path = g_strndup(*str, cur - *str);
-            else
+            } else {
                 uri->path = uri_string_unescape(*str, cur - *str, NULL);
+            }
         } else {
             uri->path = NULL;
         }
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_hier_part(URI *uri, const char **str)
     if ((*cur == '/') && (*(cur + 1) == '/')) {
         cur += 2;
         ret = rfc3986_parse_authority(uri, &cur);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
         ret = rfc3986_parse_path_ab_empty(uri, &cur);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
         *str = cur;
         return 0;
     } else if (*cur == '/') {
         ret = rfc3986_parse_path_absolute(uri, &cur);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
     } else if (ISA_PCHAR(cur)) {
         ret = rfc3986_parse_path_rootless(uri, &cur);
-        if (ret != 0)
+        if (ret != 0) {
             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)
     if ((*str == '/') && (*(str + 1) == '/')) {
         str += 2;
         ret = rfc3986_parse_authority(uri, &str);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
         ret = rfc3986_parse_path_ab_empty(uri, &str);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
     } else if (*str == '/') {
         ret = rfc3986_parse_path_absolute(uri, &str);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
     } else if (ISA_PCHAR(str)) {
         ret = rfc3986_parse_path_no_scheme(uri, &str);
-        if (ret != 0)
+        if (ret != 0) {
             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)
     if (*str == '?') {
         str++;
         ret = rfc3986_parse_query(uri, &str);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
     }
     if (*str == '#') {
         str++;
         ret = rfc3986_parse_fragment(uri, &str);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
     }
     if (*str != 0) {
         uri_clean(uri);
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse(URI *uri, const char *str)
     int ret;
 
     ret = rfc3986_parse_scheme(uri, &str);
-    if (ret != 0)
+    if (ret != 0) {
         return ret;
+    }
     if (*str != ':') {
         return 1;
     }
     str++;
     ret = rfc3986_parse_hier_part(uri, &str);
-    if (ret != 0)
+    if (ret != 0) {
         return ret;
+    }
     if (*str == '?') {
         str++;
         ret = rfc3986_parse_query(uri, &str);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
     }
     if (*str == '#') {
         str++;
         ret = rfc3986_parse_fragment(uri, &str);
-        if (ret != 0)
+        if (ret != 0) {
             return ret;
+        }
     }
     if (*str != 0) {
         uri_clean(uri);
@@ -XXX,XX +XXX,XX @@ static int rfc3986_parse_uri_reference(URI *uri, const char *str)
 {
     int ret;
 
-    if (str == NULL)
+    if (str == NULL) {
         return -1;
+    }
     uri_clean(uri);
 
     /*
@@ -XXX,XX +XXX,XX @@ URI *uri_parse(const char *str)
     URI *uri;
     int ret;
 
-    if (str == NULL)
+    if (str == NULL) {
         return NULL;
+    }
     uri = uri_new();
     ret = rfc3986_parse_uri_reference(uri, str);
     if (ret) {
@@ -XXX,XX +XXX,XX @@ URI *uri_parse_raw(const char *str, int raw)
     URI *uri;
     int ret;
 
-    if (str == NULL)
+    if (str == NULL) {
         return NULL;
+    }
     uri = uri_new();
     if (raw) {
         uri->cleanup |= 2;
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
     int len;
     int max;
 
-    if (uri == NULL)
+    if (uri == NULL) {
         return NULL;
+    }
 
     max = 80;
     ret = g_malloc(max + 1);
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
                 temp = realloc2n(ret, &max);
                 ret = temp;
             }
-            if (IS_RESERVED(*(p)) || IS_UNRESERVED(*(p)))
+            if (IS_RESERVED(*(p)) || IS_UNRESERVED(*(p))) {
                 ret[len++] = *p++;
-            else {
+            } else {
                 int val = *(unsigned char *)p++;
                 int hi = val / 0x10, lo = val % 0x10;
                 ret[len++] = '%';
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
                     }
                     if ((IS_UNRESERVED(*(p))) || ((*(p) == ';')) ||
                         ((*(p) == ':')) || ((*(p) == '&')) || ((*(p) == '=')) ||
-                        ((*(p) == '+')) || ((*(p) == '$')) || ((*(p) == ',')))
+                        ((*(p) == '+')) || ((*(p) == '$')) || ((*(p) == ','))) {
                         ret[len++] = *p++;
-                    else {
+                    } else {
                         int val = *(unsigned char *)p++;
                         int hi = val / 0x10, lo = val % 0x10;
                         ret[len++] = '%';
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
                 if ((IS_UNRESERVED(*(p))) || ((*(p) == '$')) ||
                     ((*(p) == ',')) || ((*(p) == ';')) || ((*(p) == ':')) ||
                     ((*(p) == '@')) || ((*(p) == '&')) || ((*(p) == '=')) ||
-                    ((*(p) == '+')))
+                    ((*(p) == '+'))) {
                     ret[len++] = *p++;
-                else {
+                } else {
                     int val = *(unsigned char *)p++;
                     int hi = val / 0x10, lo = val % 0x10;
                     ret[len++] = '%';
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
                 if ((IS_UNRESERVED(*(p))) || ((*(p) == '/')) ||
                     ((*(p) == ';')) || ((*(p) == '@')) || ((*(p) == '&')) ||
                     ((*(p) == '=')) || ((*(p) == '+')) || ((*(p) == '$')) ||
-                    ((*(p) == ',')))
+                    ((*(p) == ','))) {
                     ret[len++] = *p++;
-                else {
+                } else {
                     int val = *(unsigned char *)p++;
                     int hi = val / 0x10, lo = val % 0x10;
                     ret[len++] = '%';
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
                 temp = realloc2n(ret, &max);
                 ret = temp;
             }
-            if ((IS_UNRESERVED(*(p))) || (IS_RESERVED(*(p))))
+            if ((IS_UNRESERVED(*(p))) || (IS_RESERVED(*(p)))) {
                 ret[len++] = *p++;
-            else {
+            } else {
                 int val = *(unsigned char *)p++;
                 int hi = val / 0x10, lo = val % 0x10;
                 ret[len++] = '%';
@@ -XXX,XX +XXX,XX @@ char *uri_to_string(URI *uri)
  */
 static void uri_clean(URI *uri)
 {
-    if (uri == NULL)
+    if (uri == NULL) {
         return;
+    }
 
     g_free(uri->scheme);
     uri->scheme = NULL;
@@ -XXX,XX +XXX,XX @@ static int normalize_uri_path(char *path)
 {
     char *cur, *out;
 
-    if (path == NULL)
+    if (path == NULL) {
         return -1;
+    }
 
     /* Skip all initial "/" chars.  We want to get to the beginning of the
      * first non-empty segment.
      */
     cur = path;
-    while (cur[0] == '/')
+    while (cur[0] == '/') {
         ++cur;
-    if (cur[0] == '\0')
+    }
+    if (cur[0] == '\0') {
         return 0;
+    }
 
     /* Keep everything we've seen so far.  */
     out = cur;
@@ -XXX,XX +XXX,XX @@ static int normalize_uri_path(char *path)
         if ((cur[0] == '.') && (cur[1] == '/')) {
             cur += 2;
             /* '//' normalization should be done at this point too */
-            while (cur[0] == '/')
+            while (cur[0] == '/') {
                 cur++;
+            }
             continue;
         }
 
@@ -XXX,XX +XXX,XX @@ static int normalize_uri_path(char *path)
          * d) If the buffer string ends with "." as a complete path segment,
          *    that "." is removed.
          */
-        if ((cur[0] == '.') && (cur[1] == '\0'))
+        if ((cur[0] == '.') && (cur[1] == '\0')) {
             break;
+        }
 
         /* Otherwise keep the segment.  */
         while (cur[0] != '/') {
-            if (cur[0] == '\0')
+            if (cur[0] == '\0') {
                 goto done_cd;
+            }
             (out++)[0] = (cur++)[0];
         }
         /* nomalize // */
-        while ((cur[0] == '/') && (cur[1] == '/'))
+        while ((cur[0] == '/') && (cur[1] == '/')) {
             cur++;
+        }
 
         (out++)[0] = (cur++)[0];
     }
@@ -XXX,XX +XXX,XX @@ done_cd:
 
     /* Reset to the beginning of the first segment for the next sequence.  */
     cur = path;
-    while (cur[0] == '/')
+    while (cur[0] == '/') {
         ++cur;
-    if (cur[0] == '\0')
+    }
+    if (cur[0] == '\0') {
         return 0;
+    }
 
     /*
      * Analyze each segment in sequence for cases (e) and (f).
@@ -XXX,XX +XXX,XX @@ done_cd:
 
         /* Find the end of the current segment.  */
         segp = cur;
-        while ((segp[0] != '/') && (segp[0] != '\0'))
+        while ((segp[0] != '/') && (segp[0] != '\0')) {
             ++segp;
+        }
 
         /* If this is the last segment, we're done (we need at least two
          * segments to meet the criteria for the (e) and (f) cases).
          */
-        if (segp[0] == '\0')
+        if (segp[0] == '\0') {
             break;
+        }
 
         /* If the first segment is "..", or if the next segment _isn't_ "..",
          * keep this segment and try the next one.
@@ -XXX,XX +XXX,XX @@ done_cd:
         /* string will overlap, do not use strcpy */
         tmp = cur;
         segp += 3;
-        while ((*tmp++ = *segp++) != 0)
-            ;
+        while ((*tmp++ = *segp++) != 0) {
+            /* No further work */
+        }
 
         /* If there are no previous segments, then keep going from here.  */
         segp = cur;
-        while ((segp > path) && ((--segp)[0] == '/'))
-            ;
-        if (segp == path)
+        while ((segp > path) && ((--segp)[0] == '/')) {
+            /* No further work */
+        }
+        if (segp == path) {
             continue;
+        }
 
         /* "segp" is pointing to the end of a previous segment; find it's
          * start.  We need to back up to the previous segment and start
@@ -XXX,XX +XXX,XX @@ done_cd:
          * remove the "foo/..".
          */
         cur = segp;
-        while ((cur > path) && (cur[-1] != '/'))
+        while ((cur > path) && (cur[-1] != '/')) {
             --cur;
+        }
     }
     out[0] = '\0';
 
@@ -XXX,XX +XXX,XX @@ done_cd:
     if (path[0] == '/') {
         cur = path;
         while ((cur[0] == '/') && (cur[1] == '.') && (cur[2] == '.') &&
-               ((cur[3] == '/') || (cur[3] == '\0')))
+               ((cur[3] == '/') || (cur[3] == '\0'))) {
             cur += 3;
+        }
 
         if (cur != path) {
             out = path;
-            while (cur[0] != '\0')
+            while (cur[0] != '\0') {
                 (out++)[0] = (cur++)[0];
+            }
             out[0] = 0;
         }
     }
@@ -XXX,XX +XXX,XX @@ done_cd:
 static int is_hex(char c)
 {
     if (((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) ||
-        ((c >= 'A') && (c <= 'F')))
+        ((c >= 'A') && (c <= 'F'))) {
         return 1;
+    }
     return 0;
 }
 
@@ -XXX,XX +XXX,XX @@ char *uri_string_unescape(const char *str, int len, char *target)
     char *ret, *out;
     const char *in;
 
-    if (str == NULL)
+    if (str == NULL) {
         return NULL;
-    if (len <= 0)
+    }
+    if (len <= 0) {
         len = strlen(str);
-    if (len < 0)
+    }
+    if (len < 0) {
         return NULL;
+    }
 
     if (target == NULL) {
         ret = g_malloc(len + 1);
-    } else
+    } else {
         ret = target;
+    }
     in = str;
     out = ret;
     while (len > 0) {
         if ((len > 2) && (*in == '%') && (is_hex(in[1])) && (is_hex(in[2]))) {
             in++;
-            if ((*in >= '0') && (*in <= '9'))
+            if ((*in >= '0') && (*in <= '9')) {
                 *out = (*in - '0');
-            else if ((*in >= 'a') && (*in <= 'f'))
+            } else if ((*in >= 'a') && (*in <= 'f')) {
                 *out = (*in - 'a') + 10;
-            else if ((*in >= 'A') && (*in <= 'F'))
+            } else if ((*in >= 'A') && (*in <= 'F')) {
                 *out = (*in - 'A') + 10;
+            }
             in++;
-            if ((*in >= '0') && (*in <= '9'))
+            if ((*in >= '0') && (*in <= '9')) {
                 *out = *out * 16 + (*in - '0');
-            else if ((*in >= 'a') && (*in <= 'f'))
+            } else if ((*in >= 'a') && (*in <= 'f')) {
                 *out = *out * 16 + (*in - 'a') + 10;
-            else if ((*in >= 'A') && (*in <= 'F'))
+            } else if ((*in >= 'A') && (*in <= 'F')) {
                 *out = *out * 16 + (*in - 'A') + 10;
+            }
             in++;
             len -= 3;
             out++;
@@ -XXX,XX +XXX,XX @@ char *uri_string_escape(const char *str, const char *list)
     const char *in;
     int len, out;
 
-    if (str == NULL)
+    if (str == NULL) {
         return NULL;
-    if (str[0] == 0)
+    }
+    if (str[0] == 0) {
         return g_strdup(str);
+    }
     len = strlen(str);
-    if (!(len > 0))
+    if (!(len > 0)) {
         return NULL;
+    }
 
     len += 20;
     ret = g_malloc(len);
@@ -XXX,XX +XXX,XX @@ char *uri_string_escape(const char *str, const char *list)
             unsigned char val;
             ret[out++] = '%';
             val = ch >> 4;
-            if (val <= 9)
+            if (val <= 9) {
                 ret[out++] = '0' + val;
-            else
+            } else {
                 ret[out++] = 'A' + val - 0xA;
+            }
             val = ch & 0xF;
-            if (val <= 9)
+            if (val <= 9) {
                 ret[out++] = '0' + val;
-            else
+            } else {
                 ret[out++] = 'A' + val - 0xA;
+            }
             in++;
         } else {
             ret[out++] = *in++;
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
      *    as a reference to "." rather than as a synonym for the current
      *    URI.  Should we do that here?
      */
-    if (uri == NULL)
+    if (uri == NULL) {
         ret = -1;
-    else {
+    } else {
         if (*uri) {
             ref = uri_new();
             ret = uri_parse_into(ref, uri);
-        } else
+        } else {
             ret = 0;
+        }
     }
-    if (ret != 0)
+    if (ret != 0) {
         goto done;
+    }
     if ((ref != NULL) && (ref->scheme != NULL)) {
         /*
          * The URI is absolute don't modify.
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
         val = g_strdup(uri);
         goto done;
     }
-    if (base == NULL)
+    if (base == NULL) {
         ret = -1;
-    else {
+    } else {
         bas = uri_new();
         ret = uri_parse_into(bas, base);
     }
     if (ret != 0) {
-        if (ref)
+        if (ref) {
             val = uri_to_string(ref);
+        }
         goto done;
     }
     if (ref == NULL) {
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
     if ((ref->scheme == NULL) && (ref->path == NULL) &&
         ((ref->authority == NULL) && (ref->server == NULL))) {
         res->scheme = g_strdup(bas->scheme);
-        if (bas->authority != NULL)
+        if (bas->authority != NULL) {
             res->authority = g_strdup(bas->authority);
-        else if (bas->server != NULL) {
+        } else if (bas->server != NULL) {
             res->server = g_strdup(bas->server);
             res->user = g_strdup(bas->user);
             res->port = bas->port;
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
      *    use an authority component.
      */
     if ((ref->authority != NULL) || (ref->server != NULL)) {
-        if (ref->authority != NULL)
+        if (ref->authority != NULL) {
             res->authority = g_strdup(ref->authority);
-        else {
+        } else {
             res->server = g_strdup(ref->server);
             res->user = g_strdup(ref->user);
             res->port = ref->port;
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
         res->path = g_strdup(ref->path);
         goto step_7;
     }
-    if (bas->authority != NULL)
+    if (bas->authority != NULL) {
         res->authority = g_strdup(bas->authority);
-    else if (bas->server != NULL) {
+    } else if (bas->server != NULL) {
         res->server = g_strdup(bas->server);
         res->user = g_strdup(bas->user);
         res->port = bas->port;
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
      * Allocate a buffer large enough for the result string.
      */
     len = 2; /* extra / and 0 */
-    if (ref->path != NULL)
+    if (ref->path != NULL) {
         len += strlen(ref->path);
-    if (bas->path != NULL)
+    }
+    if (bas->path != NULL) {
         len += strlen(bas->path);
+    }
     res->path = g_malloc(len);
     res->path[0] = 0;
 
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
     out = 0;
     if (bas->path != NULL) {
         while (bas->path[cur] != 0) {
-            while ((bas->path[cur] != 0) && (bas->path[cur] != '/'))
+            while ((bas->path[cur] != 0) && (bas->path[cur] != '/')) {
                 cur++;
-            if (bas->path[cur] == 0)
+            }
+            if (bas->path[cur] == 0) {
                 break;
+            }
 
             cur++;
             while (out < cur) {
@@ -XXX,XX +XXX,XX @@ char *uri_resolve(const char *uri, const char *base)
         /*
          * Ensure the path includes a '/'
          */
-        if ((out == 0) && (bas->server != NULL))
+        if ((out == 0) && (bas->server != NULL)) {
             res->path[out++] = '/';
+        }
         while (ref->path[indx] != 0) {
             res->path[out++] = ref->path[indx++];
         }
@@ -XXX,XX +XXX,XX @@ step_7:
     val = uri_to_string(res);
 
 done:
-    if (ref != NULL)
+    if (ref != NULL) {
         uri_free(ref);
-    if (bas != NULL)
+    }
+    if (bas != NULL) {
         uri_free(bas);
-    if (res != NULL)
+    }
+    if (res != NULL) {
         uri_free(res);
+    }
     return val;
 }
 
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
     char *bptr, *uptr, *vptr;
     int remove_path = 0;
 
-    if ((uri == NULL) || (*uri == 0))
+    if ((uri == NULL) || (*uri == 0)) {
         return NULL;
+    }
 
     /*
      * First parse URI into a standard form
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
     /* If URI not already in "relative" form */
     if (uri[0] != '.') {
         ret = uri_parse_into(ref, uri);
-        if (ret != 0)
+        if (ret != 0) {
             goto done; /* Error in URI, return NULL */
-    } else
+        }
+    } else {
         ref->path = g_strdup(uri);
+    }
 
     /*
      * Next parse base into the same standard form
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
     bas = uri_new();
     if (base[0] != '.') {
         ret = uri_parse_into(bas, base);
-        if (ret != 0)
+        if (ret != 0) {
             goto done; /* Error in base, return NULL */
-    } else
+        }
+    } else {
         bas->path = g_strdup(base);
+    }
 
     /*
      * If the scheme / server on the URI differs from the base,
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
     if (bas->path == NULL) {
         if (ref->path != NULL) {
             uptr = ref->path;
-            if (*uptr == '/')
+            if (*uptr == '/') {
                 uptr++;
+            }
             /* exception characters from uri_to_string */
             val = uri_string_escape(uptr, "/;&=+$,");
         }
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
     bptr = bas->path;
     if (ref->path == NULL) {
         for (ix = 0; bptr[ix] != 0; ix++) {
-            if (bptr[ix] == '/')
+            if (bptr[ix] == '/') {
                 nbslash++;
+            }
         }
         uptr = NULL;
         len = 1; /* this is for a string terminator only */
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
         /*
          * Next we compare the two strings and find where they first differ
          */
-        if ((ref->path[pos] == '.') && (ref->path[pos + 1] == '/'))
+        if ((ref->path[pos] == '.') && (ref->path[pos + 1] == '/')) {
             pos += 2;
-        if ((*bptr == '.') && (bptr[1] == '/'))
+        }
+        if ((*bptr == '.') && (bptr[1] == '/')) {
             bptr += 2;
-        else if ((*bptr == '/') && (ref->path[pos] != '/'))
+        } else if ((*bptr == '/') && (ref->path[pos] != '/')) {
             bptr++;
-        while ((bptr[pos] == ref->path[pos]) && (bptr[pos] != 0))
+        }
+        while ((bptr[pos] == ref->path[pos]) && (bptr[pos] != 0)) {
             pos++;
+        }
 
         if (bptr[pos] == ref->path[pos]) {
             val = g_strdup("");
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
          * beginning of the "unique" suffix of URI
          */
         ix = pos;
-        if ((ref->path[ix] == '/') && (ix > 0))
+        if ((ref->path[ix] == '/') && (ix > 0)) {
             ix--;
-        else if ((ref->path[ix] == 0) && (ix > 1) && (ref->path[ix - 1] == '/'))
+        } else if ((ref->path[ix] == 0) && (ix > 1)
+                && (ref->path[ix - 1] == '/')) {
             ix -= 2;
+        }
         for (; ix > 0; ix--) {
-            if (ref->path[ix] == '/')
+            if (ref->path[ix] == '/') {
                 break;
+            }
         }
         if (ix == 0) {
             uptr = ref->path;
@@ -XXX,XX +XXX,XX @@ char *uri_resolve_relative(const char *uri, const char *base)
          */
         if (bptr[pos] != ref->path[pos]) { /* check for trivial URI == base */
             for (; bptr[ix] != 0; ix++) {
-                if (bptr[ix] == '/')
+                if (bptr[ix] == '/') {
                     nbslash++;
+                }
             }
         }
         len = strlen(uptr) + 1;
     }
 
     if (nbslash == 0) {
-        if (uptr != NULL)
+        if (uptr != NULL) {
             /* exception characters from uri_to_string */
             val = uri_string_escape(uptr, "/;&=+$,");
+        }
         goto done;
     }
 
@@ -XXX,XX +XXX,XX @@ done:
     /*
      * Free the working variables
      */
-    if (remove_path != 0)
+    if (remove_path != 0) {
         ref->path = NULL;
-    if (ref != NULL)
+    }
+    if (ref != NULL) {
         uri_free(ref);
-    if (bas != NULL)
+    }
+    if (bas != NULL) {
         uri_free(bas);
+    }
 
     return val;
 }
@@ -XXX,XX +XXX,XX @@ struct QueryParams *query_params_new(int init_alloc)
 {
     struct QueryParams *ps;
 
-    if (init_alloc <= 0)
+    if (init_alloc <= 0) {
         init_alloc = 1;
+    }
 
     ps = g_new(QueryParams, 1);
     ps->n = 0;
@@ -XXX,XX +XXX,XX @@ struct QueryParams *query_params_parse(const char *query)
     const char *end, *eq;
 
     ps = query_params_new(0);
-    if (!query || query[0] == '\0')
+    if (!query || query[0] == '\0') {
         return ps;
+    }
 
     while (*query) {
         char *name = NULL, *value = NULL;
 
         /* Find the next separator, or end of the string. */
         end = strchr(query, '&');
-        if (!end)
+        if (!end) {
             end = strchr(query, ';');
-        if (!end)
+        }
+        if (!end) {
             end = query + strlen(query);
+        }
 
         /* Find the first '=' character between here and end. */
         eq = strchr(query, '=');
-        if (eq && eq >= end)
+        if (eq && eq >= end) {
             eq = NULL;
+        }
 
         /* Empty section (eg. "&&"). */
-        if (end == query)
+        if (end == query) {
             goto next;
+        }
 
         /* If there is no '=' character, then we have just "name"
          * and consistent with CGI.pm we assume value is "".
@@ -XXX,XX +XXX,XX @@ struct QueryParams *query_params_parse(const char *query)
         /* If the '=' character is at the beginning then we have
          * "=value" and consistent with CGI.pm we _ignore_ this.
          */
-        else if (query == eq)
+        else if (query == eq) {
             goto next;
+        }
 
         /* Otherwise it's "name=value". */
         else {
@@ -XXX,XX +XXX,XX @@ struct QueryParams *query_params_parse(const char *query)
 
     next:
         query = end;
-        if (*query)
+        if (*query) {
             query++; /* skip '&' separator */
+        }
     }
 
     return ps;
-- 
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: Fam Zheng <famz@redhat.com>

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-id: 20180226030326.20219-3-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 README | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/README b/README
index XXXXXXX..XXXXXXX 100644
--- a/README
+++ b/README
@@ -XXX,XX +XXX,XX @@ The QEMU source code is maintained under the GIT version control system.
 
    git clone git://git.qemu.org/qemu.git
 
-When submitting patches, the preferred approach is to use 'git
+When submitting patches, one common approach is to use 'git
 format-patch' and/or 'git send-email' to format & send the mail to the
 qemu-devel@nongnu.org mailing list. All patches submitted must contain
 a 'Signed-off-by' line from the author. Patches should follow the
@@ -XXX,XX +XXX,XX @@ The QEMU website is also maintained under source control.
   git clone git://git.qemu.org/qemu-web.git
   https://www.qemu.org/2017/02/04/the-new-qemu-website-is-up/
 
+A 'git-profile' utility was created to make above process less
+cumbersome, and is highly recommended for making regular contributions,
+or even just for sending consecutive patch series revisions. It also
+requires a working 'git send-email' setup, and by default doesn't
+automate everything, so you may want to go through the above steps
+manually for once.
+
+For installation instructions, please go to
+
+  https://github.com/stefanha/git-publish
+
+The workflow with 'git-publish' is:
+
+  $ git checkout master -b my-feature
+  $ # work on new commits, add your 'Signed-off-by' lines to each
+  $ git publish
+
+Your patch series will be sent and tagged as my-feature-v1 if you need to refer
+back to it in the future.
+
+Sending v2:
+
+  $ git checkout my-feature # same topic branch
+  $ # making changes to the commits (using 'git rebase', for example)
+  $ git publish
+
+Your patch series will be sent with 'v2' tag in the subject and the git tip
+will be tagged as my-feature-v2.
+
 Bug reporting
 =============
 
-- 
2.14.3

The following changes since commit 6c769690ac845fa62642a5f93b4e4bd906adab95:

Merge remote-tracking branch 'remotes/vsementsov/tags/pull-simplebench-2021-05-04' into staging (2021-05-21 12:02:34 +0100)

are available in the Git repository at:

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

for you to fetch changes up to 0a6f0c76a030710780ce10d6347a70f098024d21:

coroutine-sleep: introduce qemu_co_sleep (2021-05-21 18:22:33 +0100)

----------------------------------------------------------------
Pull request

(Resent due to an email preparation mistake.)

----------------------------------------------------------------

Paolo Bonzini (6):
  coroutine-sleep: use a stack-allocated timer
  coroutine-sleep: disallow NULL QemuCoSleepState** argument
  coroutine-sleep: allow qemu_co_sleep_wake that wakes nothing
  coroutine-sleep: move timer out of QemuCoSleepState
  coroutine-sleep: replace QemuCoSleepState pointer with struct in the
    API
  coroutine-sleep: introduce qemu_co_sleep

Philippe Mathieu-Daudé (1):
  bitops.h: Improve find_xxx_bit() documentation

Zenghui Yu (1):
  multi-process: Initialize variables declared with g_auto*

-- 
2.31.1

From: Zenghui Yu <yuzenghui@huawei.com>

Quote docs/devel/style.rst (section "Automatic memory deallocation"):

* Variables declared with g_auto* MUST always be initialized,
  otherwise the cleanup function will use uninitialized stack memory

Initialize @name properly to get rid of the compilation error (using
gcc-7.3.0 on CentOS):

../hw/remote/proxy.c: In function 'pci_proxy_dev_realize':
/usr/include/glib-2.0/glib/glib-autocleanups.h:28:3: error: 'name' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   g_free (*pp);
   ^~~~~~~~~~~~
../hw/remote/proxy.c:350:30: note: 'name' was declared here
             g_autofree char *name;
                              ^~~~

Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
Reviewed-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com>
Message-id: 20210312112143.1369-1-yuzenghui@huawei.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/remote/memory.c | 5 ++---
 hw/remote/proxy.c  | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/hw/remote/memory.c b/hw/remote/memory.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/memory.c
+++ b/hw/remote/memory.c
@@ -XXX,XX +XXX,XX @@ void remote_sysmem_reconfig(MPQemuMsg *msg, Error **errp)
 
     remote_sysmem_reset();
 
-    for (region = 0; region < msg->num_fds; region++) {
-        g_autofree char *name;
+    for (region = 0; region < msg->num_fds; region++, suffix++) {
+        g_autofree char *name = g_strdup_printf("remote-mem-%u", suffix);
         subregion = g_new(MemoryRegion, 1);
-        name = g_strdup_printf("remote-mem-%u", suffix++);
         memory_region_init_ram_from_fd(subregion, NULL,
                                        name, sysmem_info->sizes[region],
                                        true, msg->fds[region],
diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -XXX,XX +XXX,XX @@ static void probe_pci_info(PCIDevice *dev, Error **errp)
                    PCI_BASE_ADDRESS_SPACE_IO : PCI_BASE_ADDRESS_SPACE_MEMORY;
 
         if (size) {
-            g_autofree char *name;
+            g_autofree char *name = g_strdup_printf("bar-region-%d", i);
             pdev->region[i].dev = pdev;
             pdev->region[i].present = true;
             if (type == PCI_BASE_ADDRESS_SPACE_MEMORY) {
                 pdev->region[i].memory = true;
             }
-            name = g_strdup_printf("bar-region-%d", i);
             memory_region_init_io(&pdev->region[i].mr, OBJECT(pdev),
                                   &proxy_mr_ops, &pdev->region[i],
                                   name, size);
-- 
2.31.1

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Document the following functions return the bitmap size
if no matching bit is found:

- find_first_bit
- find_next_bit
- find_last_bit
- find_first_zero_bit
- find_next_zero_bit

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20210510200758.2623154-2-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/qemu/bitops.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/include/qemu/bitops.h b/include/qemu/bitops.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/bitops.h
+++ b/include/qemu/bitops.h
@@ -XXX,XX +XXX,XX @@ static inline int test_bit(long nr, const unsigned long *addr)
  * @addr: The address to start the search at
  * @size: The maximum size to search
  *
- * Returns the bit number of the first set bit, or size.
+ * Returns the bit number of the last set bit,
+ * or @size if there is no set bit in the bitmap.
  */
 unsigned long find_last_bit(const unsigned long *addr,
                             unsigned long size);
@@ -XXX,XX +XXX,XX @@ unsigned long find_last_bit(const unsigned long *addr,
  * @addr: The address to base the search on
  * @offset: The bitnumber to start searching at
  * @size: The bitmap size in bits
+ *
+ * Returns the bit number of the next set bit,
+ * or @size if there are no further set bits in the bitmap.
  */
 unsigned long find_next_bit(const unsigned long *addr,
                             unsigned long size,
@@ -XXX,XX +XXX,XX @@ unsigned long find_next_bit(const unsigned long *addr,
  * @addr: The address to base the search on
  * @offset: The bitnumber to start searching at
  * @size: The bitmap size in bits
+ *
+ * Returns the bit number of the next cleared bit,
+ * or @size if there are no further clear bits in the bitmap.
  */
 
 unsigned long find_next_zero_bit(const unsigned long *addr,
@@ -XXX,XX +XXX,XX @@ unsigned long find_next_zero_bit(const unsigned long *addr,
  * @addr: The address to start the search at
  * @size: The maximum size to search
  *
- * Returns the bit number of the first set bit.
+ * Returns the bit number of the first set bit,
+ * or @size if there is no set bit in the bitmap.
  */
 static inline unsigned long find_first_bit(const unsigned long *addr,
                                            unsigned long size)
@@ -XXX,XX +XXX,XX @@ static inline unsigned long find_first_bit(const unsigned long *addr,
  * @addr: The address to start the search at
  * @size: The maximum size to search
  *
- * Returns the bit number of the first cleared bit.
+ * Returns the bit number of the first cleared bit,
+ * or @size if there is no clear bit in the bitmap.
  */
 static inline unsigned long find_first_zero_bit(const unsigned long *addr,
                                                 unsigned long size)
-- 
2.31.1

From: Paolo Bonzini <pbonzini@redhat.com>

The lifetime of the timer is well-known (it cannot outlive
qemu_co_sleep_ns_wakeable, because it's deleted by the time the
coroutine resumes), so it is not necessary to place it on the heap.

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20210517100548.28806-2-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/qemu-coroutine-sleep.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index XXXXXXX..XXXXXXX 100644
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -XXX,XX +XXX,XX @@ static const char *qemu_co_sleep_ns__scheduled = "qemu_co_sleep_ns";
 
 struct QemuCoSleepState {
     Coroutine *co;
-    QEMUTimer *ts;
+    QEMUTimer ts;
     QemuCoSleepState **user_state_pointer;
 };
 
@@ -XXX,XX +XXX,XX @@ void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
     if (sleep_state->user_state_pointer) {
         *sleep_state->user_state_pointer = NULL;
     }
-    timer_del(sleep_state->ts);
+    timer_del(&sleep_state->ts);
     aio_co_wake(sleep_state->co);
 }
 
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
     AioContext *ctx = qemu_get_current_aio_context();
     QemuCoSleepState state = {
         .co = qemu_coroutine_self(),
-        .ts = aio_timer_new(ctx, type, SCALE_NS, co_sleep_cb, &state),
         .user_state_pointer = sleep_state,
     };
 
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
         abort();
     }
 
+    aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, &state);
     if (sleep_state) {
         *sleep_state = &state;
     }
-    timer_mod(state.ts, qemu_clock_get_ns(type) + ns);
+    timer_mod(&state.ts, qemu_clock_get_ns(type) + ns);
     qemu_coroutine_yield();
     if (sleep_state) {
         /*
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
          */
         assert(*sleep_state == NULL);
     }
-    timer_free(state.ts);
 }
-- 
2.31.1

From: Paolo Bonzini <pbonzini@redhat.com>

Simplify the code by removing conditionals.  qemu_co_sleep_ns
can simply point the argument to an on-stack temporary.

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20210517100548.28806-3-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/qemu/coroutine.h    |  5 +++--
 util/qemu-coroutine-sleep.c | 18 +++++-------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -XXX,XX +XXX,XX @@ typedef struct QemuCoSleepState QemuCoSleepState;
 
 /**
  * Yield the coroutine for a given duration. During this yield, @sleep_state
- * (if not NULL) is set to an opaque pointer, which may be used for
+ * is set to an opaque pointer, which may be used for
  * qemu_co_sleep_wake(). Be careful, the pointer is set back to zero when the
  * timer fires. Don't save the obtained value to other variables and don't call
  * qemu_co_sleep_wake from another aio context.
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
                                             QemuCoSleepState **sleep_state);
 static inline void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns)
 {
-    qemu_co_sleep_ns_wakeable(type, ns, NULL);
+    QemuCoSleepState *unused = NULL;
+    qemu_co_sleep_ns_wakeable(type, ns, &unused);
 }
 
 /**
diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index XXXXXXX..XXXXXXX 100644
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -XXX,XX +XXX,XX @@ void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
                                            qemu_co_sleep_ns__scheduled, NULL);
 
     assert(scheduled == qemu_co_sleep_ns__scheduled);
-    if (sleep_state->user_state_pointer) {
-        *sleep_state->user_state_pointer = NULL;
-    }
+    *sleep_state->user_state_pointer = NULL;
     timer_del(&sleep_state->ts);
     aio_co_wake(sleep_state->co);
 }
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
     }
 
     aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, &state);
-    if (sleep_state) {
-        *sleep_state = &state;
-    }
+    *sleep_state = &state;
     timer_mod(&state.ts, qemu_clock_get_ns(type) + ns);
     qemu_coroutine_yield();
-    if (sleep_state) {
-        /*
-         * Note that *sleep_state is cleared during qemu_co_sleep_wake
-         * before resuming this coroutine.
-         */
-        assert(*sleep_state == NULL);
-    }
+
+    /* qemu_co_sleep_wake clears *sleep_state before resuming this coroutine.  */
+    assert(*sleep_state == NULL);
 }
-- 
2.31.1

From: Paolo Bonzini <pbonzini@redhat.com>

All callers of qemu_co_sleep_wake are checking whether they are passing
a NULL argument inside the pointer-to-pointer: do the check in
qemu_co_sleep_wake itself.

As a side effect, qemu_co_sleep_wake can be called more than once and
it will only wake the coroutine once; after the first time, the argument
will be set to NULL via *sleep_state->user_state_pointer.  However, this
would not be safe unless co_sleep_cb keeps using the QemuCoSleepState*
directly, so make it go through the pointer-to-pointer instead.

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20210517100548.28806-4-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/block-copy.c          |  4 +---
 block/nbd.c                 |  8 ++------
 util/qemu-coroutine-sleep.c | 21 ++++++++++++---------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/block/block-copy.c b/block/block-copy.c
index XXXXXXX..XXXXXXX 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -XXX,XX +XXX,XX @@ out:
 
 void block_copy_kick(BlockCopyCallState *call_state)
 {
-    if (call_state->sleep_state) {
-        qemu_co_sleep_wake(call_state->sleep_state);
-    }
+    qemu_co_sleep_wake(call_state->sleep_state);
 }
 
 /*
diff --git a/block/nbd.c b/block/nbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn nbd_client_co_drain_begin(BlockDriverState *bs)
     BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
 
     s->drained = true;
-    if (s->connection_co_sleep_ns_state) {
-        qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
-    }
+    qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
 
     nbd_co_establish_connection_cancel(bs, false);
 
@@ -XXX,XX +XXX,XX @@ static void nbd_teardown_connection(BlockDriverState *bs)
 
     s->state = NBD_CLIENT_QUIT;
     if (s->connection_co) {
-        if (s->connection_co_sleep_ns_state) {
-            qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
-        }
+        qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
         nbd_co_establish_connection_cancel(bs, true);
     }
     if (qemu_in_coroutine()) {
diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index XXXXXXX..XXXXXXX 100644
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -XXX,XX +XXX,XX @@ struct QemuCoSleepState {
 
 void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
 {
-    /* Write of schedule protected by barrier write in aio_co_schedule */
-    const char *scheduled = qatomic_cmpxchg(&sleep_state->co->scheduled,
-                                           qemu_co_sleep_ns__scheduled, NULL);
+    if (sleep_state) {
+        /* Write of schedule protected by barrier write in aio_co_schedule */
+        const char *scheduled = qatomic_cmpxchg(&sleep_state->co->scheduled,
+                                                qemu_co_sleep_ns__scheduled, NULL);
 
-    assert(scheduled == qemu_co_sleep_ns__scheduled);
-    *sleep_state->user_state_pointer = NULL;
-    timer_del(&sleep_state->ts);
-    aio_co_wake(sleep_state->co);
+        assert(scheduled == qemu_co_sleep_ns__scheduled);
+        *sleep_state->user_state_pointer = NULL;
+        timer_del(&sleep_state->ts);
+        aio_co_wake(sleep_state->co);
+    }
 }
 
 static void co_sleep_cb(void *opaque)
 {
-    qemu_co_sleep_wake(opaque);
+    QemuCoSleepState **sleep_state = opaque;
+    qemu_co_sleep_wake(*sleep_state);
 }
 
 void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
         abort();
     }
 
-    aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, &state);
+    aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, sleep_state);
     *sleep_state = &state;
     timer_mod(&state.ts, qemu_clock_get_ns(type) + ns);
     qemu_coroutine_yield();
-- 
2.31.1

From: Paolo Bonzini <pbonzini@redhat.com>

This simplification is enabled by the previous patch.  Now aio_co_wake
will only be called once, therefore we do not care about a spurious
firing of the timer after a qemu_co_sleep_wake.

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20210517100548.28806-5-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/qemu-coroutine-sleep.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index XXXXXXX..XXXXXXX 100644
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -XXX,XX +XXX,XX @@ static const char *qemu_co_sleep_ns__scheduled = "qemu_co_sleep_ns";
 
 struct QemuCoSleepState {
     Coroutine *co;
-    QEMUTimer ts;
     QemuCoSleepState **user_state_pointer;
 };
 
@@ -XXX,XX +XXX,XX @@ void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
 
         assert(scheduled == qemu_co_sleep_ns__scheduled);
         *sleep_state->user_state_pointer = NULL;
-        timer_del(&sleep_state->ts);
         aio_co_wake(sleep_state->co);
     }
 }
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
                                             QemuCoSleepState **sleep_state)
 {
     AioContext *ctx = qemu_get_current_aio_context();
+    QEMUTimer ts;
     QemuCoSleepState state = {
         .co = qemu_coroutine_self(),
         .user_state_pointer = sleep_state,
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
         abort();
     }
 
-    aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, sleep_state);
+    aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, sleep_state);
     *sleep_state = &state;
-    timer_mod(&state.ts, qemu_clock_get_ns(type) + ns);
+    timer_mod(&ts, qemu_clock_get_ns(type) + ns);
     qemu_coroutine_yield();
+    timer_del(&ts);
 
     /* qemu_co_sleep_wake clears *sleep_state before resuming this coroutine.  */
     assert(*sleep_state == NULL);
-- 
2.31.1

From: Paolo Bonzini <pbonzini@redhat.com>

Right now, users of qemu_co_sleep_ns_wakeable are simply passing
a pointer to QemuCoSleepState by reference to the function.  But
QemuCoSleepState really is just a Coroutine*; making the
content of the struct public is just as efficient and lets us
skip the user_state_pointer indirection.

Since the usage is changed, take the occasion to rename the
struct to QemuCoSleep.

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20210517100548.28806-6-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/qemu/coroutine.h    | 23 +++++++++++----------
 block/block-copy.c          |  8 ++++----
 block/nbd.c                 | 10 ++++-----
 util/qemu-coroutine-sleep.c | 41 ++++++++++++++++---------------------
 4 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -XXX,XX +XXX,XX @@ void qemu_co_rwlock_wrlock(CoRwlock *lock);
  */
 void qemu_co_rwlock_unlock(CoRwlock *lock);
 
-typedef struct QemuCoSleepState QemuCoSleepState;
+typedef struct QemuCoSleep {
+    Coroutine *to_wake;
+} QemuCoSleep;
 
 /**
- * Yield the coroutine for a given duration. During this yield, @sleep_state
- * is set to an opaque pointer, which may be used for
- * qemu_co_sleep_wake(). Be careful, the pointer is set back to zero when the
- * timer fires. Don't save the obtained value to other variables and don't call
- * qemu_co_sleep_wake from another aio context.
+ * Yield the coroutine for a given duration. Initializes @w so that,
+ * during this yield, it can be passed to qemu_co_sleep_wake() to
+ * terminate the sleep.
  */
-void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
-                                            QemuCoSleepState **sleep_state);
+void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
+                                            QEMUClockType type, int64_t ns);
+
 static inline void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns)
 {
-    QemuCoSleepState *unused = NULL;
-    qemu_co_sleep_ns_wakeable(type, ns, &unused);
+    QemuCoSleep w = { 0 };
+    qemu_co_sleep_ns_wakeable(&w, type, ns);
 }
 
 /**
@@ -XXX,XX +XXX,XX @@ static inline void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns)
  * qemu_co_sleep_ns() and should be checked to be non-NULL before calling
  * qemu_co_sleep_wake().
  */
-void qemu_co_sleep_wake(QemuCoSleepState *sleep_state);
+void qemu_co_sleep_wake(QemuCoSleep *w);
 
 /**
  * Yield until a file descriptor becomes readable
diff --git a/block/block-copy.c b/block/block-copy.c
index XXXXXXX..XXXXXXX 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -XXX,XX +XXX,XX @@ typedef struct BlockCopyCallState {
     /* State */
     int ret;
     bool finished;
-    QemuCoSleepState *sleep_state;
+    QemuCoSleep sleep;
     bool cancelled;
 
     /* OUT parameters */
@@ -XXX,XX +XXX,XX @@ block_copy_dirty_clusters(BlockCopyCallState *call_state)
                 if (ns > 0) {
                     block_copy_task_end(task, -EAGAIN);
                     g_free(task);
-                    qemu_co_sleep_ns_wakeable(QEMU_CLOCK_REALTIME, ns,
-                                              &call_state->sleep_state);
+                    qemu_co_sleep_ns_wakeable(&call_state->sleep,
+                                              QEMU_CLOCK_REALTIME, ns);
                     continue;
                 }
             }
@@ -XXX,XX +XXX,XX @@ out:
 
 void block_copy_kick(BlockCopyCallState *call_state)
 {
-    qemu_co_sleep_wake(call_state->sleep_state);
+    qemu_co_sleep_wake(&call_state->sleep);
 }
 
 /*
diff --git a/block/nbd.c b/block/nbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVNBDState {
     CoQueue free_sema;
     Coroutine *connection_co;
     Coroutine *teardown_co;
-    QemuCoSleepState *connection_co_sleep_ns_state;
+    QemuCoSleep reconnect_sleep;
     bool drained;
     bool wait_drained_end;
     int in_flight;
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn nbd_client_co_drain_begin(BlockDriverState *bs)
     BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
 
     s->drained = true;
-    qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
+    qemu_co_sleep_wake(&s->reconnect_sleep);
 
     nbd_co_establish_connection_cancel(bs, false);
 
@@ -XXX,XX +XXX,XX @@ static void nbd_teardown_connection(BlockDriverState *bs)
 
     s->state = NBD_CLIENT_QUIT;
     if (s->connection_co) {
-        qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
+        qemu_co_sleep_wake(&s->reconnect_sleep);
         nbd_co_establish_connection_cancel(bs, true);
     }
     if (qemu_in_coroutine()) {
@@ -XXX,XX +XXX,XX @@ static coroutine_fn void nbd_co_reconnect_loop(BDRVNBDState *s)
             }
             bdrv_inc_in_flight(s->bs);
         } else {
-            qemu_co_sleep_ns_wakeable(QEMU_CLOCK_REALTIME, timeout,
-                                      &s->connection_co_sleep_ns_state);
+            qemu_co_sleep_ns_wakeable(&s->reconnect_sleep,
+                                      QEMU_CLOCK_REALTIME, timeout);
             if (s->drained) {
                 continue;
             }
diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index XXXXXXX..XXXXXXX 100644
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -XXX,XX +XXX,XX @@
 
 static const char *qemu_co_sleep_ns__scheduled = "qemu_co_sleep_ns";
 
-struct QemuCoSleepState {
+void qemu_co_sleep_wake(QemuCoSleep *w)
+{
     Coroutine *co;
-    QemuCoSleepState **user_state_pointer;
-};
 
-void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
-{
-    if (sleep_state) {
+    co = w->to_wake;
+    w->to_wake = NULL;
+    if (co) {
         /* Write of schedule protected by barrier write in aio_co_schedule */
-        const char *scheduled = qatomic_cmpxchg(&sleep_state->co->scheduled,
+        const char *scheduled = qatomic_cmpxchg(&co->scheduled,
                                                 qemu_co_sleep_ns__scheduled, NULL);
 
         assert(scheduled == qemu_co_sleep_ns__scheduled);
-        *sleep_state->user_state_pointer = NULL;
-        aio_co_wake(sleep_state->co);
+        aio_co_wake(co);
     }
 }
 
 static void co_sleep_cb(void *opaque)
 {
-    QemuCoSleepState **sleep_state = opaque;
-    qemu_co_sleep_wake(*sleep_state);
+    QemuCoSleep *w = opaque;
+    qemu_co_sleep_wake(w);
 }
 
-void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
-                                            QemuCoSleepState **sleep_state)
+void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
+                                            QEMUClockType type, int64_t ns)
 {
+    Coroutine *co = qemu_coroutine_self();
     AioContext *ctx = qemu_get_current_aio_context();
     QEMUTimer ts;
-    QemuCoSleepState state = {
-        .co = qemu_coroutine_self(),
-        .user_state_pointer = sleep_state,
-    };
 
-    const char *scheduled = qatomic_cmpxchg(&state.co->scheduled, NULL,
-                                           qemu_co_sleep_ns__scheduled);
+    const char *scheduled = qatomic_cmpxchg(&co->scheduled, NULL,
+                                            qemu_co_sleep_ns__scheduled);
     if (scheduled) {
         fprintf(stderr,
                 "%s: Co-routine was already scheduled in '%s'\n",
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
         abort();
     }
 
-    aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, sleep_state);
-    *sleep_state = &state;
+    w->to_wake = co;
+    aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, w),
     timer_mod(&ts, qemu_clock_get_ns(type) + ns);
     qemu_coroutine_yield();
     timer_del(&ts);
 
-    /* qemu_co_sleep_wake clears *sleep_state before resuming this coroutine.  */
-    assert(*sleep_state == NULL);
+    /* w->to_wake is cleared before resuming this coroutine.  */
+    assert(w->to_wake == NULL);
 }
-- 
2.31.1

From: Paolo Bonzini <pbonzini@redhat.com>

Allow using QemuCoSleep to sleep forever until woken by qemu_co_sleep_wake.
This makes the logic of qemu_co_sleep_ns_wakeable easy to understand.

In the future we will introduce an API that can work even if the
sleep and wake happen from different threads.  For now, initializing
w->to_wake after timer_mod is fine because the timer can only fire in
the same AioContext.

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20210517100548.28806-7-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/qemu/coroutine.h    |  5 +++++
 util/qemu-coroutine-sleep.c | 26 +++++++++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -XXX,XX +XXX,XX @@ typedef struct QemuCoSleep {
 void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
                                             QEMUClockType type, int64_t ns);
 
+/**
+ * Yield the coroutine until the next call to qemu_co_sleep_wake.
+ */
+void coroutine_fn qemu_co_sleep(QemuCoSleep *w);
+
 static inline void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns)
 {
     QemuCoSleep w = { 0 };
diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index XXXXXXX..XXXXXXX 100644
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -XXX,XX +XXX,XX @@ static void co_sleep_cb(void *opaque)
     qemu_co_sleep_wake(w);
 }
 
-void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
-                                            QEMUClockType type, int64_t ns)
+void coroutine_fn qemu_co_sleep(QemuCoSleep *w)
 {
     Coroutine *co = qemu_coroutine_self();
-    AioContext *ctx = qemu_get_current_aio_context();
-    QEMUTimer ts;
 
     const char *scheduled = qatomic_cmpxchg(&co->scheduled, NULL,
                                             qemu_co_sleep_ns__scheduled);
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
     }
 
     w->to_wake = co;
-    aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, w),
-    timer_mod(&ts, qemu_clock_get_ns(type) + ns);
     qemu_coroutine_yield();
-    timer_del(&ts);
 
     /* w->to_wake is cleared before resuming this coroutine.  */
     assert(w->to_wake == NULL);
 }
+
+void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
+                                            QEMUClockType type, int64_t ns)
+{
+    AioContext *ctx = qemu_get_current_aio_context();
+    QEMUTimer ts;
+
+    aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, w);
+    timer_mod(&ts, qemu_clock_get_ns(type) + ns);
+
+    /*
+     * The timer will fire in the current AiOContext, so the callback
+     * must happen after qemu_co_sleep yields and there is no race
+     * between timer_mod and qemu_co_sleep.
+     */
+    qemu_co_sleep(w);
+    timer_del(&ts);
+}
-- 
2.31.1