diff options
| author | Peter Maydell | 2016-07-01 12:18:00 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-07-01 12:18:01 +0200 |
| commit | 1fb4c13e4f92bda047f30177d5b8c2b4ca42e8b8 (patch) | |
| tree | 1a364b8593876135e3490a850d687569b79aa772 /qapi/string-output-visitor.c | |
| parent | linux-user: Fix compilation when F_SETPIPE_SZ isn't defined (diff) | |
| parent | qapi: Fix memleak in string visitors on int lists (diff) | |
| download | qemu-1fb4c13e4f92bda047f30177d5b8c2b4ca42e8b8.tar.gz qemu-1fb4c13e4f92bda047f30177d5b8c2b4ca42e8b8.tar.xz qemu-1fb4c13e4f92bda047f30177d5b8c2b4ca42e8b8.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-06-30' into staging
QAPI patches 2016-06-30
# gpg: Signature made Thu 30 Jun 2016 14:29:43 BST
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2016-06-30:
qapi: Fix memleak in string visitors on int lists
qapi: Simplify use of range.h
range: Create range.c for code that should not be inline
qapi: Fix crash on missing alternate member of QAPI struct
checkpatch: There is no qemu_strtod()
qobject: Correct JSON lexer grammar comments
json-streamer: Don't leak tokens on incomplete parse
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi/string-output-visitor.c')
| -rw-r--r-- | qapi/string-output-visitor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c index d01319628b..5ea395ab98 100644 --- a/qapi/string-output-visitor.c +++ b/qapi/string-output-visitor.c @@ -85,7 +85,7 @@ static void string_output_append(StringOutputVisitor *sov, int64_t a) Range *r = g_malloc0(sizeof(*r)); r->begin = a; r->end = a + 1; - sov->ranges = g_list_insert_sorted_merged(sov->ranges, r, range_compare); + sov->ranges = range_list_insert(sov->ranges, r); } static void string_output_append_range(StringOutputVisitor *sov, @@ -94,7 +94,7 @@ static void string_output_append_range(StringOutputVisitor *sov, Range *r = g_malloc0(sizeof(*r)); r->begin = s; r->end = e + 1; - sov->ranges = g_list_insert_sorted_merged(sov->ranges, r, range_compare); + sov->ranges = range_list_insert(sov->ranges, r); } static void format_string(StringOutputVisitor *sov, Range *r, bool next, |