summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ctld
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2014-10-22 09:17:17 +0000
committertrasz <trasz@FreeBSD.org>2014-10-22 09:17:17 +0000
commit853fc00c2a595397930af55fa5123c8e08aa36c0 (patch)
tree06d7a15efbcff2378ce0e28c8ef1ed1f44905886 /usr.sbin/ctld
parent1bb0800b27fa08cfe8ed7bc8488ef14bdff2e2a8 (diff)
downloadFreeBSD-src-853fc00c2a595397930af55fa5123c8e08aa36c0.zip
FreeBSD-src-853fc00c2a595397930af55fa5123c8e08aa36c0.tar.gz
Whitespace fixes.
MFC after: 1 month Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'usr.sbin/ctld')
-rw-r--r--usr.sbin/ctld/ctld.c12
-rw-r--r--usr.sbin/ctld/kernel.c6
-rw-r--r--usr.sbin/ctld/keys.c2
-rw-r--r--usr.sbin/ctld/login.c6
-rw-r--r--usr.sbin/ctld/parse.y2
5 files changed, 14 insertions, 14 deletions
diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c
index e4c2eda..a8a7a110 100644
--- a/usr.sbin/ctld/ctld.c
+++ b/usr.sbin/ctld/ctld.c
@@ -255,7 +255,7 @@ auth_new_chap_mutual(struct auth_group *ag, const char *user,
if (ag->ag_name != NULL)
log_warnx("cannot mix \"chap-mutual\" authentication "
"with other types for auth-group \"%s\"",
- ag->ag_name);
+ ag->ag_name);
else
log_warnx("cannot mix \"chap-mutual\" authentication "
"with other types for target \"%s\"",
@@ -754,7 +754,7 @@ valid_iscsi_name(const char *name)
for (i = strlen("iqn."); name[i] != '\0'; i++) {
/*
* XXX: We should verify UTF-8 normalisation, as defined
- * by 3.2.6.2: iSCSI Name Encoding.
+ * by 3.2.6.2: iSCSI Name Encoding.
*/
if (isalnum(name[i]))
continue;
@@ -1281,10 +1281,10 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
/*
* XXX: If target or lun removal fails, we should somehow "move"
- * the old lun or target into newconf, so that subsequent
- * conf_apply() would try to remove them again. That would
- * be somewhat hairy, though, and lun deletion failures don't
- * really happen, so leave it as it is for now.
+ * the old lun or target into newconf, so that subsequent
+ * conf_apply() would try to remove them again. That would
+ * be somewhat hairy, though, and lun deletion failures don't
+ * really happen, so leave it as it is for now.
*/
TAILQ_FOREACH_SAFE(oldtarg, &oldconf->conf_targets, t_next, tmptarg) {
/*
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
index 030ca1e..219313f 100644
--- a/usr.sbin/ctld/kernel.c
+++ b/usr.sbin/ctld/kernel.c
@@ -105,7 +105,7 @@ struct cctl_lun_nv {
};
/*
- * Backend LUN information.
+ * Backend LUN information.
*/
struct cctl_lun {
uint64_t lun_id;
@@ -237,7 +237,7 @@ cctl_end_element(void *user_data, const char *name)
} else if (strcmp(name, "lun") == 0) {
devlist->cur_lun = NULL;
} else if (strcmp(name, "ctllunlist") == 0) {
-
+ /* Nothing. */
} else {
struct cctl_lun_nv *nv;
@@ -342,7 +342,7 @@ cctl_end_pelement(void *user_data, const char *name)
} else if (strcmp(name, "targ_port") == 0) {
devlist->cur_port = NULL;
} else if (strcmp(name, "ctlportlist") == 0) {
-
+ /* Nothing. */
} else {
struct cctl_lun_nv *nv;
diff --git a/usr.sbin/ctld/keys.c b/usr.sbin/ctld/keys.c
index c2abe84..6a9ad02 100644
--- a/usr.sbin/ctld/keys.c
+++ b/usr.sbin/ctld/keys.c
@@ -116,7 +116,7 @@ keys_save(struct keys *keys, struct pdu *pdu)
for (i = 0; i < KEYS_MAX; i++) {
if (keys->keys_names[i] == NULL)
break;
- /*
+ /*
* +1 for '=', +1 for '\0'.
*/
len += strlen(keys->keys_names[i]) +
diff --git a/usr.sbin/ctld/login.c b/usr.sbin/ctld/login.c
index d6fd1ff..ee00389 100644
--- a/usr.sbin/ctld/login.c
+++ b/usr.sbin/ctld/login.c
@@ -640,7 +640,7 @@ login_negotiate(struct connection *conn, struct pdu *request)
if (conn->conn_target->t_alias != NULL)
keys_add(response_keys,
"TargetAlias", conn->conn_target->t_alias);
- keys_add_int(response_keys, "TargetPortalGroupTag",
+ keys_add_int(response_keys, "TargetPortalGroupTag",
conn->conn_portal->p_portal_group->pg_tag);
}
@@ -852,7 +852,7 @@ login(struct connection *conn)
if (conn->conn_target->t_alias != NULL)
keys_add(response_keys,
"TargetAlias", conn->conn_target->t_alias);
- keys_add_int(response_keys, "TargetPortalGroupTag",
+ keys_add_int(response_keys, "TargetPortalGroupTag",
conn->conn_portal->p_portal_group->pg_tag);
}
keys_save(response_keys, response);
@@ -903,7 +903,7 @@ login(struct connection *conn)
if (conn->conn_target->t_alias != NULL)
keys_add(response_keys,
"TargetAlias", conn->conn_target->t_alias);
- keys_add_int(response_keys, "TargetPortalGroupTag",
+ keys_add_int(response_keys, "TargetPortalGroupTag",
conn->conn_portal->p_portal_group->pg_tag);
}
keys_save(response_keys, response);
diff --git a/usr.sbin/ctld/parse.y b/usr.sbin/ctld/parse.y
index 645201b..3acd480 100644
--- a/usr.sbin/ctld/parse.y
+++ b/usr.sbin/ctld/parse.y
@@ -625,7 +625,7 @@ lun_device_id: DEVICE_ID STR
lun_option: OPTION STR STR
{
struct lun_option *clo;
-
+
clo = lun_option_new(lun, $2, $3);
free($2);
free($3);
OpenPOWER on IntegriCloud