[src/trunk]: src satisfy the slightly more picky clang

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/402164fbf7ea
branches:  trunk
changeset: 782848:402164fbf7ea
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Nov 22 21:23:08 2012 +0000

description:
satisfy the slightly more picky clang

diffstat:

 lib/librumpuser/rumpuser_port.h     |  4 ++--
 sys/rump/librump/rumpvfs/rump_vfs.c |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r a3fe12cd215f -r 402164fbf7ea lib/librumpuser/rumpuser_port.h
--- a/lib/librumpuser/rumpuser_port.h   Thu Nov 22 21:21:21 2012 +0000
+++ b/lib/librumpuser/rumpuser_port.h   Thu Nov 22 21:23:08 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpuser_port.h,v 1.5 2012/11/21 17:41:27 pooka Exp $  */
+/*     $NetBSD: rumpuser_port.h,v 1.6 2012/11/22 21:23:08 pooka Exp $  */
 
 /*
  * Portability header for non-NetBSD platforms.
@@ -113,7 +113,7 @@
 #endif
 
 #ifndef __dead
-#define __dead
+#define __dead __attribute__((__noreturn__))
 #endif
 
 #ifndef __printflike
diff -r a3fe12cd215f -r 402164fbf7ea sys/rump/librump/rumpvfs/rump_vfs.c
--- a/sys/rump/librump/rumpvfs/rump_vfs.c       Thu Nov 22 21:21:21 2012 +0000
+++ b/sys/rump/librump/rumpvfs/rump_vfs.c       Thu Nov 22 21:23:08 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump_vfs.c,v 1.69 2012/11/18 18:39:23 pooka Exp $      */
+/*     $NetBSD: rump_vfs.c,v 1.70 2012/11/22 21:23:08 pooka Exp $      */
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.69 2012/11/18 18:39:23 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.70 2012/11/22 21:23:08 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -269,7 +269,7 @@
        voff_t *vsize, dev_t *vdev)
 {
 
-       *vtype = vp->v_type;
+       *vtype = (enum rump_vtype)vp->v_type;
        *vsize = vp->v_size;
        if (vp->v_specnode)
                *vdev = vp->v_rdev;
@@ -323,7 +323,7 @@
 rump_vattr_settype(struct vattr *vap, enum rump_vtype vt)
 {
 
-       vap->va_type = vt;
+       vap->va_type = (enum vtype)vt;
 }
 
 void