From owner-svn-src-all@FreeBSD.ORG Wed May 7 07:41:58 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B775E14E; Wed, 7 May 2014 07:41:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A45381AF; Wed, 7 May 2014 07:41:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s477fwCC024377; Wed, 7 May 2014 07:41:58 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s477fwAk024376; Wed, 7 May 2014 07:41:58 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201405070741.s477fwAk024376@svn.freebsd.org> From: Edward Tomasz Napierala Date: Wed, 7 May 2014 07:41:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r265516 - stable/10/usr.sbin/ctld X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2014 07:41:58 -0000 Author: trasz Date: Wed May 7 07:41:58 2014 New Revision: 265516 URL: http://svnweb.freebsd.org/changeset/base/265516 Log: MFC r264533: Use consistent punctuation. Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.sbin/ctld/ctld.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/ctld/ctld.c ============================================================================== --- stable/10/usr.sbin/ctld/ctld.c Wed May 7 07:40:45 2014 (r265515) +++ stable/10/usr.sbin/ctld/ctld.c Wed May 7 07:41:58 2014 (r265516) @@ -1214,7 +1214,7 @@ conf_apply(struct conf *oldconf, struct log_debugx("enabling CTL iSCSI port"); error = kernel_port_on(); if (error != 0) - log_errx(1, "failed to enable CTL iSCSI port, exiting"); + log_errx(1, "failed to enable CTL iSCSI port; exiting"); } else { error = kernel_port_off(); if (error != 0) @@ -1839,7 +1839,7 @@ main(int argc, char **argv) oldconf = conf_new_from_kernel(); newconf = conf_new_from_file(config_path); if (newconf == NULL) - log_errx(1, "configuration error, exiting"); + log_errx(1, "configuration error; exiting"); if (debug > 0) { oldconf->conf_debug = debug; newconf->conf_debug = debug; @@ -1847,7 +1847,8 @@ main(int argc, char **argv) error = conf_apply(oldconf, newconf); if (error != 0) - log_errx(1, "failed to apply configuration, exiting"); + log_errx(1, "failed to apply configuration; exiting"); + conf_delete(oldconf); oldconf = NULL;