From nobody Mon Feb 9 01:31:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1618560445; cv=none; d=zohomail.com; s=zohoarc; b=WsDmwb6OYtxp3L7XSVxsuBLLI3efRn0QGEdMB6OGfOcfYyyMeo/NoOIkZihJ38+P4ZfmKXmUE4VqGuvotDjXF/x9iSPZAKGQmkIKWGruVzf0COvqpu9rFF4aD3NqVdeAYGKM8fjrJjotbWLzrZcW0+h8ntDkEVWPZfmm+rFz3cw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618560445; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w2L/fKLZztWqAr2HUTJcBRNZkNk0HmDNyAPjQMkEFbw=; b=Eu14xT4LGoDcbJy5xFk2Aiod+M/2Mtvuy2rVN4QzbR0MPhGfhmWGIxo/NvYJ4whdb+a8/GMSjNfVMx3dgb3NZl0EJeV5HD/18ibLdGN863X8gRG5DJk3TXGbXPPby4I/BBN6QqvW96lmFSxAt5EzXs6Rs1k1/QXKkML2pdfoXzM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1618560445323835.5065272342516; Fri, 16 Apr 2021 01:07:25 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-530-s2hDiWa6M8a0io3I5gPV8Q-1; Fri, 16 Apr 2021 04:07:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BBE14195D565; Fri, 16 Apr 2021 08:07:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ECD9410429F0; Fri, 16 Apr 2021 08:07:15 +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 1D69844A5E; Fri, 16 Apr 2021 08:07:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13G87CS2026063 for ; Fri, 16 Apr 2021 04:07:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id EC6B77092B; Fri, 16 Apr 2021 08:07:12 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2AE566E512 for ; Fri, 16 Apr 2021 08:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618560444; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=w2L/fKLZztWqAr2HUTJcBRNZkNk0HmDNyAPjQMkEFbw=; b=ApQw0pLmkqRflIb2fsDnuhRjTRLI5K81lTXi6Y3jgMQFl6MXTmYHG9Hb94NEAnS5ubewNq IMC5zx5Z1FeKnzfBn8t5d0bKNtQzPyW2MCXxVtS7VVdx6gsELDjJMFdSlvrQKahWhUxwax Qh6c4ZeLZmoIsUBmEvFNv8V/b0ooV3o= X-MC-Unique: s2hDiWa6M8a0io3I5gPV8Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/5] util: virxml: Fix formatting of virxml.h Date: Fri, 16 Apr 2021 10:07:01 +0200 Message-Id: <1f6f525bb3e4e61ca3502bcf61ad05077c937472.1618560390.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Remove the "block" formatting of function declarations and use uniform spacing. Signed-off-by: Peter Krempa --- src/util/virxml.h | 192 +++++++++++++++++++++++++++------------------- 1 file changed, 112 insertions(+), 80 deletions(-) diff --git a/src/util/virxml.h b/src/util/virxml.h index de171dce12..84fa4f4baf 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -32,60 +32,80 @@ xmlXPathContextPtr virXMLXPathContextNew(xmlDocPtr xml) G_GNUC_WARN_UNUSED_RESULT; -int virXPathBoolean(const char *xpath, - xmlXPathContextPtr ctxt); -char * virXPathString(const char *xpath, - xmlXPathContextPtr ctxt); -char * virXPathStringLimit(const char *xpath, - size_t maxlen, - xmlXPathContextPtr ctxt); -int virXPathNumber(const char *xpath, - xmlXPathContextPtr ctxt, - double *value); -int virXPathInt(const char *xpath, - xmlXPathContextPtr ctxt, - int *value); -int virXPathUInt(const char *xpath, - xmlXPathContextPtr ctxt, - unsigned int *value); -int virXPathLong(const char *xpath, - xmlXPathContextPtr ctxt, - long *value); -int virXPathULong(const char *xpath, - xmlXPathContextPtr ctxt, - unsigned long *value); -int virXPathULongLong(const char *xpath, - xmlXPathContextPtr ctxt, - unsigned long long *value); -int virXPathLongLong(const char *xpath, - xmlXPathContextPtr ctxt, - long long *value); -int virXPathLongHex(const char *xpath, - xmlXPathContextPtr ctxt, - long *value); -int virXPathULongHex(const char *xpath, - xmlXPathContextPtr ctxt, - unsigned long *value); -xmlNodePtr virXPathNode(const char *xpath, - xmlXPathContextPtr ctxt); -int virXPathNodeSet(const char *xpath, - xmlXPathContextPtr ctxt, - xmlNodePtr **list); -char * virXMLPropString(xmlNodePtr node, - const char *name); -char * virXMLPropStringLimit(xmlNodePtr node, - const char *name, - size_t maxlen); -char * virXMLNodeContentString(xmlNodePtr node); +int +virXPathBoolean(const char *xpath, + xmlXPathContextPtr ctxt); +char * +virXPathString(const char *xpath, + xmlXPathContextPtr ctxt); +char * +virXPathStringLimit(const char *xpath, + size_t maxlen, + xmlXPathContextPtr ctxt); +int +virXPathNumber(const char *xpath, + xmlXPathContextPtr ctxt, + double *value); +int +virXPathInt(const char *xpath, + xmlXPathContextPtr ctxt, + int *value); +int +virXPathUInt(const char *xpath, + xmlXPathContextPtr ctxt, + unsigned int *value); +int +virXPathLong(const char *xpath, + xmlXPathContextPtr ctxt, + long *value); +int +virXPathULong(const char *xpath, + xmlXPathContextPtr ctxt, + unsigned long *value); +int +virXPathULongLong(const char *xpath, + xmlXPathContextPtr ctxt, + unsigned long long *value); +int +virXPathLongLong(const char *xpath, + xmlXPathContextPtr ctxt, + long long *value); +int +virXPathLongHex(const char *xpath, + xmlXPathContextPtr ctxt, + long *value); +int +virXPathULongHex(const char *xpath, + xmlXPathContextPtr ctxt, + unsigned long *value); +xmlNodePtr +virXPathNode(const char *xpath, + xmlXPathContextPtr ctxt); +int +virXPathNodeSet(const char *xpath, + xmlXPathContextPtr ctxt, + xmlNodePtr **list); +char * +virXMLPropString(xmlNodePtr node, + const char *name); +char * +virXMLPropStringLimit(xmlNodePtr node, + const char *name, + size_t maxlen); +char * +virXMLNodeContentString(xmlNodePtr node); /* Internal function; prefer the macros below. */ -xmlDocPtr virXMLParseHelper(int domcode, - const char *filename, - const char *xmlStr, - const char *url, - xmlXPathContextPtr *pctxt); - -const char *virXMLPickShellSafeComment(const char *str1, const char *str2); +xmlDocPtr +virXMLParseHelper(int domcode, + const char *filename, + const char *xmlStr, + const char *url, + xmlXPathContextPtr *pctxt); + +const char * +virXMLPickShellSafeComment(const char *str1, + const char *str2); /** * virXMLParse: * @filename: file to parse, or NULL for string parsing @@ -164,32 +184,41 @@ const char *virXMLPickShellSafeComment(const char *st= r1, const char *str2); #define virXMLParseFileCtxt(filename, pctxt) \ virXMLParseHelper(VIR_FROM_THIS, filename, NULL, NULL, pctxt) -int virXMLSaveFile(const char *path, - const char *warnName, - const char *warnCommand, - const char *xml); - -char *virXMLNodeToString(xmlDocPtr doc, xmlNodePtr node); +int +virXMLSaveFile(const char *path, + const char *warnName, + const char *warnCommand, + const char *xml); -bool virXMLNodeNameEqual(xmlNodePtr node, - const char *name); +char * +virXMLNodeToString(xmlDocPtr doc, + xmlNodePtr node); -xmlNodePtr virXMLFindChildNodeByNs(xmlNodePtr root, - const char *uri); +bool +virXMLNodeNameEqual(xmlNodePtr node, + const char *name); -int virXMLExtractNamespaceXML(xmlNodePtr root, - const char *uri, - char **doc); +xmlNodePtr +virXMLFindChildNodeByNs(xmlNodePtr root, + const char *uri); -int virXMLInjectNamespace(xmlNodePtr node, +int +virXMLExtractNamespaceXML(xmlNodePtr root, const char *uri, - const char *key); + char **doc); -void virXMLNodeSanitizeNamespaces(xmlNodePtr node); +int +virXMLInjectNamespace(xmlNodePtr node, + const char *uri, + const char *key); -int virXMLCheckIllegalChars(const char *nodeName, - const char *str, - const char *illegal); +void +virXMLNodeSanitizeNamespaces(xmlNodePtr node); + +int +virXMLCheckIllegalChars(const char *nodeName, + const char *str, + const char *illegal); struct _virXMLValidator { xmlRelaxNGParserCtxtPtr rngParser; @@ -255,9 +284,11 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(xmlXPathContext, xmlXPat= hFreeContext); G_DEFINE_AUTOPTR_CLEANUP_FUNC(xmlBuffer, xmlBufferFree); G_DEFINE_AUTOPTR_CLEANUP_FUNC(xmlNode, xmlFreeNode); -typedef int (*virXMLNamespaceParse)(xmlXPathContextPtr ctxt, void **nsdata= ); +typedef int (*virXMLNamespaceParse)(xmlXPathContextPtr ctxt, + void **nsdata); typedef void (*virXMLNamespaceFree)(void *nsdata); -typedef int (*virXMLNamespaceFormat)(virBuffer *buf, void *nsdata); +typedef int (*virXMLNamespaceFormat)(virBuffer *buf, + void *nsdata); typedef const char *(*virXMLNamespaceHref)(void); struct _virXMLNamespace { @@ -276,13 +307,14 @@ int virXMLNamespaceRegister(xmlXPathContextPtr ctxt, virXMLNamespace const *ns); -int virParseScaledValue(const char *xpath, - const char *units_xpath, - xmlXPathContextPtr ctxt, - unsigned long long *val, - unsigned long long scale, - unsigned long long max, - bool required); +int +virParseScaledValue(const char *xpath, + const char *units_xpath, + xmlXPathContextPtr ctxt, + unsigned long long *val, + unsigned long long scale, + unsigned long long max, + bool required); xmlBufferPtr virXMLBufferCreate(void); --=20 2.30.2