From patchwork Tue Apr 19 16:22:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 66111 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1952582qge; Tue, 19 Apr 2016 09:25:13 -0700 (PDT) X-Received: by 10.55.77.202 with SMTP id a193mr4923750qkb.48.1461083113100; Tue, 19 Apr 2016 09:25:13 -0700 (PDT) Return-Path: Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com. [209.132.183.24]) by mx.google.com with ESMTPS id m144si4594297qhb.42.2016.04.19.09.25.12 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Apr 2016 09:25:13 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.24 as permitted sender) client-ip=209.132.183.24; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.24 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u3JGMeE4025749; Tue, 19 Apr 2016 12:22:41 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u3JGMGfS018076 for ; Tue, 19 Apr 2016 12:22:16 -0400 Received: from colepc.redhat.com (ovpn-113-99.phx2.redhat.com [10.3.113.99]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3JGMETx025281; Tue, 19 Apr 2016 12:22:15 -0400 From: Cole Robinson To: libvirt-list@redhat.com Date: Tue, 19 Apr 2016 12:22:07 -0400 Message-Id: <6acb175cd824502f4664659718a97af3e17ff211.1461082800.git.crobinso@redhat.com> In-Reply-To: <9ec32b9b363d11eb8c3f26a6921a31edbd64d183.1461082800.git.crobinso@redhat.com> References: <9ec32b9b363d11eb8c3f26a6921a31edbd64d183.1461082800.git.crobinso@redhat.com> In-Reply-To: <9ec32b9b363d11eb8c3f26a6921a31edbd64d183.1461082800.git.crobinso@redhat.com> References: <9ec32b9b363d11eb8c3f26a6921a31edbd64d183.1461082800.git.crobinso@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Peter Krempa , mnestratov@virtuozzo.com Subject: [libvirt] [PATCH 2/2] libvirt: Use conventional function names 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: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com do_open and winsock_init don't follow the naming pattern of other functions in this file. Rename them to match --- src/libvirt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.7.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/libvirt.c b/src/libvirt.c index 919c9cb..749089b 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -257,7 +257,7 @@ virConnectAuthPtr virConnectAuthPtrDefault = &virConnectAuthDefault; #if HAVE_WINSOCK2_H static int -winsock_init(void) +virWinsockInit(void) { WORD winsock_version, err; WSADATA winsock_data; @@ -386,7 +386,7 @@ virGlobalInit(void) VIR_DEBUG("register drivers"); #if HAVE_WINSOCK2_H - if (winsock_init() == -1) + if (virWinsockInit() == -1) goto error; #endif @@ -958,9 +958,9 @@ virConnectCheckURIMissingSlash(const char *uristr, virURIPtr uri) static virConnectPtr -do_open(const char *name, - virConnectAuthPtr auth, - unsigned int flags) +virConnectOpenInternal(const char *name, + virConnectAuthPtr auth, + unsigned int flags) { size_t i; int res; @@ -1161,7 +1161,7 @@ virConnectOpen(const char *name) VIR_DEBUG("name=%s", NULLSTR(name)); virResetLastError(); - ret = do_open(name, NULL, 0); + ret = virConnectOpenInternal(name, NULL, 0); if (!ret) goto error; return ret; @@ -1197,7 +1197,7 @@ virConnectOpenReadOnly(const char *name) VIR_DEBUG("name=%s", NULLSTR(name)); virResetLastError(); - ret = do_open(name, NULL, VIR_CONNECT_RO); + ret = virConnectOpenInternal(name, NULL, VIR_CONNECT_RO); if (!ret) goto error; return ret; @@ -1237,7 +1237,7 @@ virConnectOpenAuth(const char *name, VIR_DEBUG("name=%s, auth=%p, flags=%x", NULLSTR(name), auth, flags); virResetLastError(); - ret = do_open(name, auth, flags); + ret = virConnectOpenInternal(name, auth, flags); if (!ret) goto error; return ret;