Module Name: src Committed By: pooka Date: Thu Nov 22 21:23:08 UTC 2012
Modified Files: src/lib/librumpuser: rumpuser_port.h src/sys/rump/librump/rumpvfs: rump_vfs.c Log Message: satisfy the slightly more picky clang To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/librumpuser/rumpuser_port.h cvs rdiff -u -r1.69 -r1.70 src/sys/rump/librump/rumpvfs/rump_vfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/librumpuser/rumpuser_port.h diff -u src/lib/librumpuser/rumpuser_port.h:1.5 src/lib/librumpuser/rumpuser_port.h:1.6 --- src/lib/librumpuser/rumpuser_port.h:1.5 Wed Nov 21 17:41:27 2012 +++ src/lib/librumpuser/rumpuser_port.h Thu Nov 22 21:23:08 2012 @@ -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 @@ posix_memalign(void **ptr, size_t align, #endif #ifndef __dead -#define __dead +#define __dead __attribute__((__noreturn__)) #endif #ifndef __printflike Index: src/sys/rump/librump/rumpvfs/rump_vfs.c diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.69 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.70 --- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.69 Sun Nov 18 18:39:23 2012 +++ src/sys/rump/librump/rumpvfs/rump_vfs.c Thu Nov 22 21:23:08 2012 @@ -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 @@ rump_getvninfo(struct vnode *vp, enum ru 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 @@ void rump_vattr_settype(struct vattr *vap, enum rump_vtype vt) { - vap->va_type = vt; + vap->va_type = (enum vtype)vt; } void