From owner-svn-src-head@FreeBSD.ORG Fri Aug 27 14:28:39 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF73C1065697; Fri, 27 Aug 2010 14:28:39 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8503A8FC1D; Fri, 27 Aug 2010 14:28:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7RESd3v080780; Fri, 27 Aug 2010 14:28:39 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7RESdpu080778; Fri, 27 Aug 2010 14:28:39 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201008271428.o7RESdpu080778@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Fri, 27 Aug 2010 14:28:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211883 - head/sbin/hastd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Aug 2010 14:28:39 -0000 Author: pjd Date: Fri Aug 27 14:28:39 2010 New Revision: 211883 URL: http://svn.freebsd.org/changeset/base/211883 Log: Reduce indent where possible. MFC after: 2 weeks Obtained from: Wheel Systems Sp. z o.o. http://www.wheelsystems.com Modified: head/sbin/hastd/parse.y Modified: head/sbin/hastd/parse.y ============================================================================== --- head/sbin/hastd/parse.y Fri Aug 27 14:26:37 2010 (r211882) +++ head/sbin/hastd/parse.y Fri Aug 27 14:28:39 2010 (r211883) @@ -256,13 +256,13 @@ control_statement: CONTROL STR } break; case 1: - if (mynode) { - if (strlcpy(lconfig->hc_controladdr, $2, - sizeof(lconfig->hc_controladdr)) >= - sizeof(lconfig->hc_controladdr)) { - pjdlog_error("control argument is too long."); - return (1); - } + if (!mynode) + break; + if (strlcpy(lconfig->hc_controladdr, $2, + sizeof(lconfig->hc_controladdr)) >= + sizeof(lconfig->hc_controladdr)) { + pjdlog_error("control argument is too long."); + return (1); } break; default: @@ -283,13 +283,13 @@ listen_statement: LISTEN STR } break; case 1: - if (mynode) { - if (strlcpy(lconfig->hc_listenaddr, $2, - sizeof(lconfig->hc_listenaddr)) >= - sizeof(lconfig->hc_listenaddr)) { - pjdlog_error("listen argument is too long."); - return (1); - } + if (!mynode) + break; + if (strlcpy(lconfig->hc_listenaddr, $2, + sizeof(lconfig->hc_listenaddr)) >= + sizeof(lconfig->hc_listenaddr)) { + pjdlog_error("listen argument is too long."); + return (1); } break; default: @@ -493,14 +493,14 @@ name_statement: NAME STR } break; case 2: - if (mynode) { - assert(curres != NULL); - if (strlcpy(curres->hr_provname, $2, - sizeof(curres->hr_provname)) >= - sizeof(curres->hr_provname)) { - pjdlog_error("name argument is too long."); - return (1); - } + if (!mynode) + break; + assert(curres != NULL); + if (strlcpy(curres->hr_provname, $2, + sizeof(curres->hr_provname)) >= + sizeof(curres->hr_provname)) { + pjdlog_error("name argument is too long."); + return (1); } break; default: @@ -521,14 +521,14 @@ local_statement: LOCAL STR } break; case 2: - if (mynode) { - assert(curres != NULL); - if (strlcpy(curres->hr_localpath, $2, - sizeof(curres->hr_localpath)) >= - sizeof(curres->hr_localpath)) { - pjdlog_error("local argument is too long."); - return (1); - } + if (!mynode) + break; + assert(curres != NULL); + if (strlcpy(curres->hr_localpath, $2, + sizeof(curres->hr_localpath)) >= + sizeof(curres->hr_localpath)) { + pjdlog_error("local argument is too long."); + return (1); } break; default: