Date: Wed, 7 May 2014 07:41:58 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> 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 Message-ID: <201405070741.s477fwAk024376@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405070741.s477fwAk024376>