From patchwork Fri Oct 2 15:17:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 525585 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 13684140311 for ; Sat, 3 Oct 2015 01:17:35 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 50E5C22C46D; Fri, 2 Oct 2015 08:17:35 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v1.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id DA96222C46C for ; Fri, 2 Oct 2015 08:17:34 -0700 (PDT) Received: from bar4.cudamail.com (bar2 [192.168.15.2]) by mx3v1.cudamail.com (Postfix) with ESMTP id 173CE618AA1 for ; Fri, 2 Oct 2015 09:17:20 -0600 (MDT) X-ASG-Debug-ID: 1443799036-03dc217c581da10001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar4.cudamail.com with ESMTP id TLSF74EyDlBroHqC (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 02 Oct 2015 09:17:16 -0600 (MDT) X-Barracuda-Envelope-From: blp@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO mail-pa0-f52.google.com) (209.85.220.52) by mx3-pf3.cudamail.com with ESMTPS (RC4-SHA encrypted); 2 Oct 2015 15:17:12 -0000 Received-SPF: unknown (mx3-pf3.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.52 Received: by padhy16 with SMTP id hy16so109119968pad.1 for ; Fri, 02 Oct 2015 08:17:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=i2pQgGJOXfgzM52Kh3tbGQYWc8IZRv/IqdocFTkSPEk=; b=cmroCIH2N06LLqNQrWdHf0INQjkDjXEvVz78yIKyLlSH9a4dNKcuI2A3rewqcEFt/u 7lZYy2l+pVd5wQGqqzHqarvyeovmH4ZeGqKNejTeboN1kb5Uj9zSVKVLhU1WDJ0C+SwV bl9s1WrDcsTqGp+PM9I6yOCBBYMVIitxHBp55JbnIbAt4wbb8O9MCgq3lgELjCFVgaNY 2DjFtkqSFpdcAeWl8pdGxMi581psUmKCX3fYUnXKvsTJGlily5rr9q2yFmICzBYvCBRM pHvH/EsC2z9UzSP/QrIkEw8OySZlnsvUNGWBekuGY8+hOIYloWxiNBE6ZIEkq0xYlTwO S15g== X-Gm-Message-State: ALoCoQkUFyZpUnNzI0vMQd+4fMQ4PBcfCu88Uki3sDIh5N5YsLFOn0Yxyipj9YeZ0YDWdcUiOGLi X-Received: by 10.68.98.34 with SMTP id ef2mr20542801pbb.45.1443799030710; Fri, 02 Oct 2015 08:17:10 -0700 (PDT) Received: from sigabrt.gateway.sonic.net (173-228-112-165.dsl.dynamic.fusionbroadband.com. [173.228.112.165]) by smtp.gmail.com with ESMTPSA id gw3sm12526476pbc.46.2015.10.02.08.17.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Oct 2015 08:17:09 -0700 (PDT) X-CudaMail-Envelope-Sender: blp@nicira.com X-Barracuda-Apparent-Source-IP: 173.228.112.165 From: Ben Pfaff To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V3-1001024930 X-CudaMail-DTE: 100215 X-CudaMail-Originating-IP: 209.85.220.52 Date: Fri, 2 Oct 2015 08:17:07 -0700 X-ASG-Orig-Subj: [##CM-V3-1001024930##][PATCH] ovn-nbctl: Avoid minor code duplication. Message-Id: <1443799027-10824-1-git-send-email-blp@nicira.com> X-Mailer: git-send-email 2.1.3 X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1443799036 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH] ovn-nbctl: Avoid minor code duplication. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Ben Pfaff Acked-by: Justin Pettit --- ovn/utilities/ovn-nbctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c index c308ddc..2d2a5ee 100644 --- a/ovn/utilities/ovn-nbctl.c +++ b/ovn/utilities/ovn-nbctl.c @@ -142,7 +142,7 @@ nbctl_default_db(void) if (!def) { def = getenv("OVN_NB_DB"); if (!def) { - def = xasprintf("unix:%s/db.sock", ovs_rundir()); + def = ctl_default_db(); } } return def;