CVS commit: src/sys/rump/net/lib/libvirtif

[Antti Kantee]

Module Name:    src
Committed By:   pooka
Date:           Wed Mar 13 21:17:32 UTC 2013

Modified Files:
        src/sys/rump/net/lib/libvirtif: rumpcomp_user.c rumpcomp_user.h

Log Message:
Fix a few minor issues found by proofreading the diff one last time.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libvirtif/rumpcomp_user.c \
    src/sys/rump/net/lib/libvirtif/rumpcomp_user.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/rump/net/lib/libvirtif/rumpcomp_user.c
diff -u src/sys/rump/net/lib/libvirtif/rumpcomp_user.c:1.1 src/sys/rump/net/lib/libvirtif/rumpcomp_user.c:1.2
--- src/sys/rump/net/lib/libvirtif/rumpcomp_user.c:1.1	Wed Mar 13 21:13:45 2013
+++ src/sys/rump/net/lib/libvirtif/rumpcomp_user.c	Wed Mar 13 21:17:32 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpcomp_user.c,v 1.1 2013/03/13 21:13:45 pooka Exp $	*/
+/*	$NetBSD: rumpcomp_user.c,v 1.2 2013/03/13 21:17:32 pooka Exp $	*/
 
 /*
  * Copyright (c) 2013 Antti Kantee.  All Rights Reserved.
@@ -127,7 +127,7 @@ rumpcomp_virtif_send(struct virtif_user 
 
 /* how often to check for interface going south */
 #define POLLTIMO_MS 10
-size_t
+ssize_t
 rumpcomp_virtif_recv(struct virtif_user *viu, void *data, size_t dlen)
 {
 	void *cookie = rumpuser_component_unschedule();
@@ -145,8 +145,10 @@ rumpcomp_virtif_recv(struct virtif_user 
 		rv = poll(&pfd, 1, POLLTIMO_MS);
 		if (rv == 0)
 			continue;
-		if (rv == -1)
+		if (rv == -1) {
+			nn = -1;
 			break;
+		}
 
 		nn = read(viu->viu_fd, data, dlen);
 		if (nn == -1 && errno == EAGAIN)
Index: src/sys/rump/net/lib/libvirtif/rumpcomp_user.h
diff -u src/sys/rump/net/lib/libvirtif/rumpcomp_user.h:1.1 src/sys/rump/net/lib/libvirtif/rumpcomp_user.h:1.2
--- src/sys/rump/net/lib/libvirtif/rumpcomp_user.h:1.1	Wed Mar 13 21:13:45 2013
+++ src/sys/rump/net/lib/libvirtif/rumpcomp_user.h	Wed Mar 13 21:17:32 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpcomp_user.h,v 1.1 2013/03/13 21:13:45 pooka Exp $	*/
+/*	$NetBSD: rumpcomp_user.h,v 1.2 2013/03/13 21:17:32 pooka Exp $	*/
 
 /*
  * Copyright (c) 2013 Antti Kantee.  All Rights Reserved.
@@ -32,4 +32,4 @@ void rumpcomp_virtif_dying(struct virtif
 void rumpcomp_virtif_destroy(struct virtif_user *);
 
 void	rumpcomp_virtif_send(struct virtif_user *, struct iovec *, size_t);
-ssize_t	rumpcomp_virtif_recv(struct virtif_user *, void *data, size_t);
+ssize_t	rumpcomp_virtif_recv(struct virtif_user *, void *, size_t);