diff options
author | Igor Sobrado <sobrado@cvs.openbsd.org> | 2010-09-25 16:20:07 +0000 |
---|---|---|
committer | Igor Sobrado <sobrado@cvs.openbsd.org> | 2010-09-25 16:20:07 +0000 |
commit | 8052d6d6974a462eef9b378ee69420392831d4b4 (patch) | |
tree | c50ca0486833fba61cd3f4a4e6ceac86d7a60955 | |
parent | 47aca9b87dccacc92554e8ed1105191dcd583999 (diff) |
spacing, no binary changes.
-rw-r--r-- | usr.sbin/iscsid/connection.c | 6 | ||||
-rw-r--r-- | usr.sbin/iscsid/initiator.c | 6 | ||||
-rw-r--r-- | usr.sbin/iscsid/iscsid.c | 4 | ||||
-rw-r--r-- | usr.sbin/iscsid/iscsid.h | 4 | ||||
-rw-r--r-- | usr.sbin/iscsid/log.c | 4 | ||||
-rw-r--r-- | usr.sbin/iscsid/pdu.c | 8 | ||||
-rw-r--r-- | usr.sbin/iscsid/task.c | 4 | ||||
-rw-r--r-- | usr.sbin/iscsid/util.c | 6 | ||||
-rw-r--r-- | usr.sbin/iscsid/vscsi.c | 4 |
9 files changed, 23 insertions, 23 deletions
diff --git a/usr.sbin/iscsid/connection.c b/usr.sbin/iscsid/connection.c index e68520e10fd..e2596891a69 100644 --- a/usr.sbin/iscsid/connection.c +++ b/usr.sbin/iscsid/connection.c @@ -1,4 +1,4 @@ -/* $OpenBSD: connection.c,v 1.3 2010/09/24 10:46:13 claudio Exp $ */ +/* $OpenBSD: connection.c,v 1.4 2010/09/25 16:20:06 sobrado Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -6,7 +6,7 @@ * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -204,7 +204,7 @@ conn_task_issue(struct connection *c, struct task *t) { /* XXX need to verify that we're in the right state for the task */ - if (!TAILQ_EMPTY(&c->tasks)) + if (!TAILQ_EMPTY(&c->tasks)) return 0; TAILQ_INSERT_TAIL(&c->tasks, t, entry); diff --git a/usr.sbin/iscsid/initiator.c b/usr.sbin/iscsid/initiator.c index 78406e22d8d..c41a149eb84 100644 --- a/usr.sbin/iscsid/initiator.c +++ b/usr.sbin/iscsid/initiator.c @@ -1,4 +1,4 @@ -/* $OpenBSD: initiator.c,v 1.2 2010/09/25 14:40:28 sobrado Exp $ */ +/* $OpenBSD: initiator.c,v 1.3 2010/09/25 16:20:06 sobrado Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -6,7 +6,7 @@ * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -94,7 +94,7 @@ session_new(struct initiator *i, u_int8_t st) if (!(s = calloc(1, sizeof(*s)))) return NULL; - + /* use the same qualifier unless there is a conflict */ s->isid_base = i->config.isid_base; s->isid_qual = i->config.isid_qual; diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index 0b9a0255b30..5a6572ce7a0 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iscsid.c,v 1.2 2010/09/25 11:57:22 sobrado Exp $ */ +/* $OpenBSD: iscsid.c,v 1.3 2010/09/25 16:20:06 sobrado Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -6,7 +6,7 @@ * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR diff --git a/usr.sbin/iscsid/iscsid.h b/usr.sbin/iscsid/iscsid.h index 1e3ebe42176..15376b83235 100644 --- a/usr.sbin/iscsid/iscsid.h +++ b/usr.sbin/iscsid/iscsid.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iscsid.h,v 1.1 2010/09/24 09:43:19 claudio Exp $ */ +/* $OpenBSD: iscsid.h,v 1.2 2010/09/25 16:20:06 sobrado Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -6,7 +6,7 @@ * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR diff --git a/usr.sbin/iscsid/log.c b/usr.sbin/iscsid/log.c index 088cb207775..35d838a6163 100644 --- a/usr.sbin/iscsid/log.c +++ b/usr.sbin/iscsid/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.1 2010/09/24 09:43:19 claudio Exp $ */ +/* $OpenBSD: log.c,v 1.2 2010/09/25 16:20:06 sobrado Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -172,7 +172,7 @@ log_hexdump(void *buf, size_t len) fprintf(stderr, "%4zi:", i); l = sizeof(b) < len - i ? sizeof(b) : len - i; bcopy((char *)buf + i, b, l); - + for (j = 0; j < sizeof(b); j++) { if (j % 2 == 0) fprintf(stderr, " "); diff --git a/usr.sbin/iscsid/pdu.c b/usr.sbin/iscsid/pdu.c index 86072b1128d..7ddfe10008d 100644 --- a/usr.sbin/iscsid/pdu.c +++ b/usr.sbin/iscsid/pdu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pdu.c,v 1.1 2010/09/24 09:43:19 claudio Exp $ */ +/* $OpenBSD: pdu.c,v 1.2 2010/09/25 16:20:06 sobrado Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -6,7 +6,7 @@ * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -44,7 +44,7 @@ pdu_gethdr(struct pdu *p) if (!(hdr = calloc(1, sizeof(struct iscsi_pdu)))) return NULL; - if (pdu_addbuf(p, hdr, sizeof(struct iscsi_pdu), PDU_HEADER)) { + if (pdu_addbuf(p, hdr, sizeof(struct iscsi_pdu), PDU_HEADER)) { free(hdr); return NULL; } @@ -77,7 +77,7 @@ text_to_pdu(struct kvp *k, struct pdu *p) s += n + 1; nk++; } - + if (pdu_addbuf(p, buf, len, PDU_DATA)) return -1; return len; diff --git a/usr.sbin/iscsid/task.c b/usr.sbin/iscsid/task.c index 1f26793deb8..263937dc7c7 100644 --- a/usr.sbin/iscsid/task.c +++ b/usr.sbin/iscsid/task.c @@ -1,4 +1,4 @@ -/* $OpenBSD: task.c,v 1.2 2010/09/25 14:40:28 sobrado Exp $ */ +/* $OpenBSD: task.c,v 1.3 2010/09/25 16:20:06 sobrado Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -6,7 +6,7 @@ * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR diff --git a/usr.sbin/iscsid/util.c b/usr.sbin/iscsid/util.c index 8e1242efbd4..15c908fa7d1 100644 --- a/usr.sbin/iscsid/util.c +++ b/usr.sbin/iscsid/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.1 2010/09/24 09:43:19 claudio Exp $ */ +/* $OpenBSD: util.c,v 1.2 2010/09/25 16:20:06 sobrado Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -6,7 +6,7 @@ * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -115,7 +115,7 @@ socket_setblockmode(int fd, int nonblocking) if (nonblocking) flags |= O_NONBLOCK; else - flags &= ~O_NONBLOCK; + flags &= ~O_NONBLOCK; if ((flags = fcntl(fd, F_SETFL, flags)) == -1) return -1; diff --git a/usr.sbin/iscsid/vscsi.c b/usr.sbin/iscsid/vscsi.c index 1517ff397bb..ef1f7ba2697 100644 --- a/usr.sbin/iscsid/vscsi.c +++ b/usr.sbin/iscsid/vscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vscsi.c,v 1.1 2010/09/24 09:43:19 claudio Exp $ */ +/* $OpenBSD: vscsi.c,v 1.2 2010/09/25 16:20:06 sobrado Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -6,7 +6,7 @@ * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |