Module Name: src
Committed By: jdc
Date: Sun Jun 24 16:11:24 UTC 2012
Modified Files:
src/lib/libperfuse [netbsd-6]: perfuse_if.h
src/usr.sbin/perfused [netbsd-6]: perfused.c
Log Message:
Pull up revisions:
src/lib/libperfuse/perfuse_if.h revision 1.19
src/usr.sbin/perfused/perfused.c revision 1.23
(requested by manu in ticket #348).
Add placeholder so that we can later add allbacks without breaking the
ABI
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.2.1 src/lib/libperfuse/perfuse_if.h
cvs rdiff -u -r1.22 -r1.22.2.1 src/usr.sbin/perfused/perfused.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/libperfuse/perfuse_if.h
diff -u src/lib/libperfuse/perfuse_if.h:1.18 src/lib/libperfuse/perfuse_if.h:1.18.2.1
--- src/lib/libperfuse/perfuse_if.h:1.18 Wed Dec 28 17:33:53 2011
+++ src/lib/libperfuse/perfuse_if.h Sun Jun 24 16:11:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: perfuse_if.h,v 1.18 2011/12/28 17:33:53 manu Exp $ */
+/* $NetBSD: perfuse_if.h,v 1.18.2.1 2012/06/24 16:11:24 jdc Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -141,6 +141,7 @@ struct perfuse_callbacks {
perfuse_get_outhdr_fn pc_get_outhdr;
perfuse_get_outpayload_fn pc_get_outpayload;
perfuse_umount_fn pc_umount;
+ void *pc_reserved[16];
};
/*
Index: src/usr.sbin/perfused/perfused.c
diff -u src/usr.sbin/perfused/perfused.c:1.22 src/usr.sbin/perfused/perfused.c:1.22.2.1
--- src/usr.sbin/perfused/perfused.c:1.22 Sat Feb 4 18:36:30 2012
+++ src/usr.sbin/perfused/perfused.c Sun Jun 24 16:11:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: perfused.c,v 1.22 2012/02/04 18:36:30 joerg Exp $ */
+/* $NetBSD: perfused.c,v 1.22.2.1 2012/06/24 16:11:24 jdc Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -245,6 +245,7 @@ new_mount(int fd, int pmnt_flags)
/*
* Initialize libperfuse, which will initialize libpuffs
*/
+ (void)memset(&pc, 0, sizeof(pc));
pc.pc_new_msg = perfused_new_pb;
pc.pc_xchg_msg = perfused_xchg_pb;
pc.pc_destroy_msg = (perfuse_destroy_msg_fn)puffs_framebuf_destroy;
