qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com
Subject: [Qemu-devel] [PULL 02/22] Remove g_sequence_lookup from qemu-img help function
Date: Mon, 19 May 2014 16:22:20 +0200	[thread overview]
Message-ID: <1400509360-25470-3-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1400509360-25470-1-git-send-email-kwolf@redhat.com>

From: Mike Day <ncmike@ncultra.org>

g_sequence_lookup is not supported by glib < 2.28. The usage
of g_sequence_lookup is not essential in this context (it's a
safeguard against duplicate values in the help message).
Removing the call enables the build on all platforms and
does not change the operation of the help function.

Signed-off-by: Mike Day <ncmike@ncultra.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qemu-img.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c
index 04ce02a..1ad899e 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -70,11 +70,8 @@ static void add_format_to_seq(void *opaque, const char *fmt_name)
 {
     GSequence *seq = opaque;
 
-    if (!g_sequence_lookup(seq, (gpointer)fmt_name,
-                           compare_data, NULL)) {
-        g_sequence_insert_sorted(seq, (gpointer)fmt_name,
-                                 compare_data, NULL);
-    }
+    g_sequence_insert_sorted(seq, (gpointer)fmt_name,
+                             compare_data, NULL);
 }
 
 static void QEMU_NORETURN GCC_FMT_ATTR(1, 2) error_exit(const char *fmt, ...)
-- 
1.8.3.1

  parent reply	other threads:[~2014-05-19 14:23 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-19 14:22 [Qemu-devel] [PULL 00/22] Block patches Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 01/22] block: Fix bdrv_is_allocated() for short backing files Kevin Wolf
2014-05-19 14:22 ` Kevin Wolf [this message]
2014-05-19 14:22 ` [Qemu-devel] [PULL 03/22] block: vhdx - account for identical header sections Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 04/22] block: add test for vhdx image created by Disk2VHD Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 05/22] qdict: Add qdict_join() Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 06/22] check-qdict: Add test for qdict_join() Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 07/22] block: Allow JSON filenames Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 08/22] iotests: Add test for the JSON protocol Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 09/22] qemu-iotests: Fix core dump suppression in test 039 Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 10/22] qemu-iotests: Fix blkdebug in VM drive in 030 Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 11/22] curl: Fix build when curl_multi_socket_action isn't available Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 12/22] curl: Remove broken parsing of options from url Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 13/22] curl: Add sslverify option Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 14/22] curl: Add usage documentation Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 15/22] qcow1: Make padding in the header explicit Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 16/22] qcow1: Check maximum cluster size Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 17/22] qcow1: Validate L2 table size (CVE-2014-0222) Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 18/22] qcow1: Validate image size (CVE-2014-0223) Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 19/22] qcow1: Stricter backing file length check Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 20/22] util: add qemu_iovec_is_zero Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 21/22] blockdev: add a function to parse enum ids from strings Kevin Wolf
2014-05-19 14:22 ` [Qemu-devel] [PULL 22/22] block: optimize zero writes with bdrv_write_zeroes Kevin Wolf
2014-05-22 14:26 ` [Qemu-devel] [PULL 00/22] Block patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1400509360-25470-3-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).