git: 237e9b7f5e90 - main - ctld: Trim trailing whitespace
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 Jan 2025 19:58:27 UTC
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=237e9b7f5e90debb31ae7fd1e0a288e302659bfd commit 237e9b7f5e90debb31ae7fd1e0a288e302659bfd Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2025-01-18 17:19:41 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2025-01-22 19:57:46 +0000 ctld: Trim trailing whitespace Sponsored by: Chelsio Communications --- usr.sbin/ctld/ctld.c | 6 +++--- usr.sbin/ctld/parse.y | 2 +- usr.sbin/ctld/uclparse.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index 497e0f6e7600..3136a5d4b7cb 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -945,7 +945,7 @@ isns_register(struct isns *isns, struct isns *oldisns) error = gethostname(hostname, sizeof(hostname)); if (error != 0) log_err(1, "gethostname"); - + if (oldisns == NULL || TAILQ_EMPTY(&oldisns->i_conf->conf_targets)) oldisns = isns; isns_do_deregister(oldisns, s, hostname); @@ -973,7 +973,7 @@ isns_check(struct isns *isns) error = gethostname(hostname, sizeof(hostname)); if (error != 0) log_err(1, "gethostname"); - + res = isns_do_check(isns, s, hostname); if (res < 0) { isns_do_deregister(isns, s, hostname); @@ -1000,7 +1000,7 @@ isns_deregister(struct isns *isns) error = gethostname(hostname, sizeof(hostname)); if (error != 0) log_err(1, "gethostname"); - + isns_do_deregister(isns, s, hostname); close(s); set_timeout(0, false); diff --git a/usr.sbin/ctld/parse.y b/usr.sbin/ctld/parse.y index d8274b623d3a..128a5b4ea042 100644 --- a/usr.sbin/ctld/parse.y +++ b/usr.sbin/ctld/parse.y @@ -115,7 +115,7 @@ debug: DEBUG STR free($2); return (1); } - + conf->conf_debug = tmp; } ; diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c index e9e42bdf953e..b93142ede8a4 100644 --- a/usr.sbin/ctld/uclparse.c +++ b/usr.sbin/ctld/uclparse.c @@ -111,7 +111,7 @@ uclparse_chap_mutual(struct auth_group *auth_group, const ucl_object_t *obj) log_warnx("chap-mutual section in auth-group \"%s\" is missing " "\"mutual-user\" string key", auth_group->ag_name); return (1); - } + } mutual_secret = ucl_object_find_key(obj, "mutual-secret"); if (!secret || secret->type != UCL_STRING) { @@ -317,7 +317,7 @@ uclparse_toplevel(const ucl_object_t *top) log_warnx("\"isns-period\" property value is not integer"); return (1); } - } + } if (!strcmp(key, "isns-timeout")) { if (obj->type == UCL_INT) @@ -462,7 +462,7 @@ uclparse_auth_group(const char *name, const ucl_object_t *top) it2 = NULL; while ((tmp = ucl_iterate_object(obj, &it2, true))) { const char *value = ucl_object_tostring(tmp); - + an = auth_name_new(auth_group, value); if (an == NULL) return (1); @@ -547,7 +547,7 @@ uclparse_portal_group(const char *name, const ucl_object_t *top) while ((tmp = ucl_iterate_object(obj, &it2, true))) { if (portal_group_add_listen( - portal_group, + portal_group, ucl_object_tostring(tmp), false) != 0) return (1); @@ -757,7 +757,7 @@ uclparse_target(const char *name, const ucl_object_t *top) target->t_auth_group = auth_group_new(conf, NULL); if (target->t_auth_group == NULL) return (1); - + target->t_auth_group->ag_target = target; } error = auth_group_set_type(target->t_auth_group, @@ -982,7 +982,7 @@ uclparse_conf(struct conf *newconf, const char *path) { struct ucl_parser *parser; ucl_object_t *top; - int error; + int error; conf = newconf; parser = ucl_parser_new(0);