summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2015-12-03 08:52:30 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2015-12-03 08:52:30 +0000
commit332b1bebef81fc388becac45329ab7f03df9812e (patch)
tree26055b3345818ba8672c84bb2120615db9193493
parent76f0632e94648b42a21fff016f294ae0bf22ff1b (diff)
spacing
-rw-r--r--usr.sbin/vmmctl/parse.y7
-rw-r--r--usr.sbin/vmmctl/vmmctl.c8
2 files changed, 8 insertions, 7 deletions
diff --git a/usr.sbin/vmmctl/parse.y b/usr.sbin/vmmctl/parse.y
index e0ca82b6779..9461963a379 100644
--- a/usr.sbin/vmmctl/parse.y
+++ b/usr.sbin/vmmctl/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.6 2015/12/02 09:20:41 reyk Exp $ */
+/* $OpenBSD: parse.y,v 1.7 2015/12/03 08:52:29 reyk Exp $ */
/*
* Copyright (c) 2007-2015 Reyk Floeter <reyk@openbsd.org>
@@ -246,7 +246,7 @@ lookup(char *s)
{ "disk", DISK },
{ "enable", ENABLE },
{ "id", VMID },
- { "include", INCLUDE },
+ { "include", INCLUDE },
{ "interfaces", NIFS },
{ "kernel", KERNEL },
{ "memory", MEMORY },
@@ -292,7 +292,8 @@ lgetc(int quotec)
if (quotec) {
if ((c = getc(file->stream)) == EOF) {
- yyerror("reached end of file while parsing quoted string");
+ yyerror("reached end of file while parsing "
+ "quoted string");
if (file == topfile || popfile() == EOF)
return (EOF);
return (quotec);
diff --git a/usr.sbin/vmmctl/vmmctl.c b/usr.sbin/vmmctl/vmmctl.c
index 4a656404aa1..c547c0da164 100644
--- a/usr.sbin/vmmctl/vmmctl.c
+++ b/usr.sbin/vmmctl/vmmctl.c
@@ -124,7 +124,7 @@ start_vm_complete(struct imsg *imsg, int *ret)
if (res) {
fprintf(stderr, "%s: start VM command failed (%d) - "
"%s\n", __progname, res, strerror(res));
- *ret = EIO;
+ *ret = EIO;
} else {
fprintf(stdout, "%s: start VM command successful, "
"tty %s\n", __progname, vmr->vmr_ttyname);
@@ -158,7 +158,7 @@ terminate_vm(uint32_t terminate_id)
imsg_compose(ibuf, IMSG_VMDOP_TERMINATE_VM_REQUEST, 0, 0, -1,
&vtp, sizeof(struct vm_terminate_params));
}
-
+
/*
* terminate_vm_complete
*
@@ -186,7 +186,7 @@ terminate_vm_complete(struct imsg *imsg, int *ret)
if (imsg->hdr.type == IMSG_VMDOP_TERMINATE_VM_RESPONSE) {
res = *(int *)imsg->data;
- if (res) {
+ if (res) {
fprintf(stderr, "%s: terminate VM command failed "
"(%d) - %s\n", __progname, res, strerror(res));
*ret = EIO;
@@ -360,6 +360,6 @@ create_imagefile(const char *imgfile_path, long imgsize)
return (ret);
}
- ret = close(fd);
+ ret = close(fd);
return (ret);
}