From 5c348e5a9f276b45e2351e4c1adf2bafd4659484 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Tue, 25 Sep 2012 14:32:06 -0400 Subject: [PATCH] Windows: make static RDR_ParseIoctlPath[Parent] The RDR_ParseIoctlPath and RDR_ParseIoctlPathParent functions are helper functions within RDRIoctl.cpp. Make them static and remove them from the header. Change-Id: I5f3b68f87701e2d8423a01c236c7cb598c3ff743 Reviewed-on: http://gerrit.openafs.org/8160 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsrdr/user/RDRIoctl.c | 14 ++++++++++---- src/WINNT/afsrdr/user/RDRIoctl.h | 6 ------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/WINNT/afsrdr/user/RDRIoctl.c b/src/WINNT/afsrdr/user/RDRIoctl.c index fc20805f7..ceb81ccd0 100644 --- a/src/WINNT/afsrdr/user/RDRIoctl.c +++ b/src/WINNT/afsrdr/user/RDRIoctl.c @@ -74,6 +74,14 @@ static osi_rwlock_t RDR_globalIoctlLock; extern wchar_t RDR_UNCName[]; +static afs_int32 +RDR_ParseIoctlPath(RDR_ioctl_t *ioctlp, cm_user_t *userp, cm_req_t *reqp, + cm_scache_t **scpp, afs_uint32 flags); + +static afs_int32 +RDR_ParseIoctlParent(RDR_ioctl_t *ioctlp, cm_user_t *userp, cm_req_t *reqp, + cm_scache_t **scpp, wchar_t *leafp); + void RDR_InitIoctl(void) { @@ -432,7 +440,7 @@ RDR_IoctlWrite(cm_user_t *userp, ULONG RequestId, ULONG BufferLength, void *Mapp */ #define CM_PARSE_FLAG_LITERAL 1 -afs_int32 +static afs_int32 RDR_ParseIoctlPath(RDR_ioctl_t *ioctlp, cm_user_t *userp, cm_req_t *reqp, cm_scache_t **scpp, afs_uint32 flags) { @@ -676,13 +684,11 @@ RDR_ParseIoctlPath(RDR_ioctl_t *ioctlp, cm_user_t *userp, cm_req_t *reqp, return 0; } - - #define LEAF_SIZE 256 /* parse the passed-in file name and do a namei on its parent. If we fail, * return an error code, otherwise return the vnode located in *scpp. */ -afs_int32 +static afs_int32 RDR_ParseIoctlParent(RDR_ioctl_t *ioctlp, cm_user_t *userp, cm_req_t *reqp, cm_scache_t **scpp, wchar_t *leafp) { diff --git a/src/WINNT/afsrdr/user/RDRIoctl.h b/src/WINNT/afsrdr/user/RDRIoctl.h index 56873650f..6ff952060 100644 --- a/src/WINNT/afsrdr/user/RDRIoctl.h +++ b/src/WINNT/afsrdr/user/RDRIoctl.h @@ -66,12 +66,6 @@ extern afs_int32 RDR_IoctlPrepareRead(RDR_ioctl_t *ioctlp, cm_user_t *userp, afs extern RDR_ioctl_t *RDR_FindIoctl(ULONG index); -extern afs_int32 RDR_ParseIoctlPath(RDR_ioctl_t *ioctlp, cm_user_t *userp, cm_req_t *reqp, - cm_scache_t **scpp, afs_uint32 flags); - -extern afs_int32 RDR_ParseIoctlParent(RDR_ioctl_t *ioctlp, cm_user_t *userp, cm_req_t *reqp, - cm_scache_t **scpp, wchar_t *leafp); - extern afs_int32 RDR_IoctlSetToken(struct RDR_ioctl *ioctlp, struct cm_user *userp, afs_uint32 pflags); -- 2.39.5