Module Name: src Committed By: pooka Date: Wed Mar 9 23:26:20 UTC 2011
Modified Files: src/lib/librumphijack: hijack.c Log Message: Make getfh() a pathcall instead of a fhcall. while it does pertain to file handles, it still gets passed a path and we can DTRT based on that. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/lib/librumphijack/hijack.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/librumphijack/hijack.c diff -u src/lib/librumphijack/hijack.c:1.81 src/lib/librumphijack/hijack.c:1.82 --- src/lib/librumphijack/hijack.c:1.81 Wed Mar 9 20:48:57 2011 +++ src/lib/librumphijack/hijack.c Wed Mar 9 23:26:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hijack.c,v 1.81 2011/03/09 20:48:57 pooka Exp $ */ +/* $NetBSD: hijack.c,v 1.82 2011/03/09 23:26:19 pooka Exp $ */ /*- * Copyright (c) 2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: hijack.c,v 1.81 2011/03/09 20:48:57 pooka Exp $"); +__RCSID("$NetBSD: hijack.c,v 1.82 2011/03/09 23:26:19 pooka Exp $"); #define __ssp_weak_name(fun) _hijack_ ## fun @@ -2199,6 +2199,11 @@ (const char *, struct plistref *), \ (path, p)) +PATHCALL(int, REALGETFH, DUALCALL_GETFH, \ + (const char *path, void *fhp, size_t *fh_size), \ + (const char *, void *, size_t *), \ + (path, fhp, fh_size)) + /* * These act different on a per-process vfs configuration */ @@ -2208,11 +2213,6 @@ (struct statvfs *, size_t, int), \ (buf, buflen, flags)) -VFSCALL(VFSBIT_FHCALLS, int, REALGETFH, DUALCALL_GETFH, \ - (const char *path, void *fhp, size_t *fh_size), \ - (const char *, void *, size_t *), \ - (path, fhp, fh_size)) - VFSCALL(VFSBIT_FHCALLS, int, REALFHOPEN, DUALCALL_FHOPEN, \ (const void *fhp, size_t fh_size, int flags), \ (const char *, size_t, int), \