From patchwork Mon Oct 7 21:49:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 175417 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4845786ill; Mon, 7 Oct 2019 14:49:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqwQW3vxJrx+IxSKxdQfSFy6TL4GTJxT0yJK+u150x6VwKZcea5rSIgH1W2kKlpIqYzE94up X-Received: by 2002:a5d:87d0:: with SMTP id q16mr572573ios.157.1570484977145; Mon, 07 Oct 2019 14:49:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570484977; cv=none; d=google.com; s=arc-20160816; b=v/amrB2XI/10QofGqQ/iL6xNCLoorve8CFA6RBvNI5lq3dMxh3Ty5LG7qZjYq8KWmx 86e5OsMXBP0UEFh+LfdvVH6mA6zfZaPrGkXhwsbo7NfZ9BqY74ZEPP5GBsG2hNrDX7CE 5qUt1aCAOxsw3lc326+LTezvLexDHjzSVdalurKgAKMEtvw5mZXavnsLui/kdowulSpm stXCCTv0sJyVo5BCxtAx2HRP+U+f0NwNgIeDPGcSp7ldNd9Pr7wkfh3qiKiwwbpMMdn7 Y6I3c3srV3nR3lBoeR0IRmTqeLKvLI5pJulf+jFNopwv6G6z6U21CyoSRnI2/CCI5ePO OUGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=678rrsui4JWFZ/rdaq3meOUymjbbvzhP0mk2rQNwUMo=; b=Smp6fmpb4U2uM9By3Qoa1jIb4rW0w/BGd/lIDYmaaIeIBJQqZZq2XW2746ACcJvbWV LiF57VzUPHtzzTPCe13Fh954bp6+WtrVn/Csw6L/Pm3uW+nc+bM6pzrajNwTy3qb/geq zLm4yJRJtfXWR4KO8VEQUVtRI69/bTfWeJ3q/fqzbBq37cuwLeLJaLc2Jvz4UnyFfGv6 eQe+MPGsIwdHdAwmK/LjfuCySokYLbmy6i8IRe4jWbgqBt2knQp5GIZ2jcFqrZDv3KCA utsV+VyZlkbn3wzlab1C5RQCJNJFcm/bShd2Qme7OP0hxCwtt73slAf+Vl1LjyESYTtS K6qA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id d6si19806312jad.105.2019.10.07.14.49.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Oct 2019 14:49:37 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D55AE307D983; Mon, 7 Oct 2019 21:49:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF05119C68; Mon, 7 Oct 2019 21:49:35 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6E3881803B4A; Mon, 7 Oct 2019 21:49:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x97LnV7s014609 for ; Mon, 7 Oct 2019 17:49:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 505445C219; Mon, 7 Oct 2019 21:49:31 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-123-156.rdu2.redhat.com [10.10.123.156]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8B8D5C1D4; Mon, 7 Oct 2019 21:49:30 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 7 Oct 2019 17:49:25 -0400 Message-Id: <5b141b336816fb546417579055a8edfe8f5cc0eb.1570482718.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 11/30] storagefile: Rename qcow2GetExtensions 'format' argument X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 07 Oct 2019 21:49:36 +0000 (UTC) To backingFormat, which makes it more clear. Move it to the end of the argument list which will scale nicer with future patches Signed-off-by: Cole Robinson --- src/util/virstoragefile.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Daniel Henrique Barboza diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index d6bd38777b..8cd576a463 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -427,9 +427,9 @@ cowGetBackingStore(char **res, static int -qcow2GetExtensions(int *format, - const char *buf, - size_t buf_size) +qcow2GetExtensions(const char *buf, + size_t buf_size, + int *backingFormat) { size_t offset; size_t extension_start; @@ -509,8 +509,8 @@ qcow2GetExtensions(int *format, case QCOW2_HDR_EXTENSION_BACKING_FORMAT: if (buf[offset+len] != '\0') break; - *format = virStorageFileFormatTypeFromString(buf+offset); - if (*format <= VIR_STORAGE_FILE_NONE) + *backingFormat = virStorageFileFormatTypeFromString(buf+offset); + if (*backingFormat <= VIR_STORAGE_FILE_NONE) return -1; } @@ -561,7 +561,7 @@ qcowXGetBackingStore(char **res, memcpy(*res, buf + offset, size); (*res)[size] = '\0'; - if (qcow2GetExtensions(format, buf, buf_size) < 0) + if (qcow2GetExtensions(buf, buf_size, format) < 0) return BACKING_STORE_INVALID; return BACKING_STORE_OK;