From owner-svn-src-all@FreeBSD.ORG Thu Aug 5 19:04:29 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72DFE106566B; Thu, 5 Aug 2010 19:04:29 +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 46E268FC1E; Thu, 5 Aug 2010 19:04:29 +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 o75J4Tke077972; Thu, 5 Aug 2010 19:04:29 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o75J4THx077969; Thu, 5 Aug 2010 19:04:29 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201008051904.o75J4THx077969@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Thu, 5 Aug 2010 19:04:29 +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: r210882 - head/sbin/hastd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 05 Aug 2010 19:04:29 -0000 Author: pjd Date: Thu Aug 5 19:04:29 2010 New Revision: 210882 URL: http://svn.freebsd.org/changeset/base/210882 Log: Make control_set_role() more public. We will need it soon. MFC after: 1 month Modified: head/sbin/hastd/control.c head/sbin/hastd/control.h Modified: head/sbin/hastd/control.c ============================================================================== --- head/sbin/hastd/control.c Thu Aug 5 19:01:57 2010 (r210881) +++ head/sbin/hastd/control.c Thu Aug 5 19:04:29 2010 (r210882) @@ -51,18 +51,18 @@ __FBSDID("$FreeBSD$"); #include "control.h" static void -control_set_role(struct hastd_config *cfg, struct nv *nvout, uint8_t role, - struct hast_resource *res, const char *name, unsigned int no) +control_set_role_common(struct hastd_config *cfg, struct nv *nvout, + uint8_t role, struct hast_resource *res, const char *name, unsigned int no) { - assert(cfg != NULL); - assert(nvout != NULL); - assert(name != NULL); - /* Name is always needed. */ - nv_add_string(nvout, name, "resource%u", no); + if (name != NULL) + nv_add_string(nvout, name, "resource%u", no); if (res == NULL) { + assert(cfg != NULL); + assert(name != NULL); + TAILQ_FOREACH(res, &cfg->hc_resources, hr_next) { if (strcmp(res->hr_name, name) == 0) break; @@ -115,6 +115,13 @@ control_set_role(struct hastd_config *cf pjdlog_prefix_set("%s", ""); } +void +control_set_role(struct hast_resource *res, uint8_t role) +{ + + control_set_role_common(NULL, NULL, role, res, NULL, 0); +} + static void control_status_worker(struct hast_resource *res, struct nv *nvout, unsigned int no) @@ -306,7 +313,7 @@ control_handle(struct hastd_config *cfg) TAILQ_FOREACH(res, &cfg->hc_resources, hr_next) { switch (cmd) { case HASTCTL_SET_ROLE: - control_set_role(cfg, nvout, role, res, + control_set_role_common(cfg, nvout, role, res, res->hr_name, ii++); break; case HASTCTL_STATUS: @@ -329,8 +336,8 @@ control_handle(struct hastd_config *cfg) break; switch (cmd) { case HASTCTL_SET_ROLE: - control_set_role(cfg, nvout, role, NULL, str, - ii); + control_set_role_common(cfg, nvout, role, NULL, + str, ii); break; case HASTCTL_STATUS: control_status(cfg, nvout, NULL, str, ii); Modified: head/sbin/hastd/control.h ============================================================================== --- head/sbin/hastd/control.h Thu Aug 5 19:01:57 2010 (r210881) +++ head/sbin/hastd/control.h Thu Aug 5 19:04:29 2010 (r210882) @@ -36,6 +36,9 @@ #define HASTCTL_STATUS 2 struct hastd_config; +struct hast_resource; + +void control_set_role(struct hast_resource *res, uint8_t role); void control_handle(struct hastd_config *cfg);