From ef5e3a4822dfca493aef6b72f36ec8da56807afc Mon Sep 17 00:00:00 2001 From: David Howells Date: Thu, 25 Jun 2020 13:25:02 +0100 Subject: [PATCH] xg: Remove the package name from YFS RPCs Remove the package name from YFS RPCs so that they don't end up duplicated in the generated code. Signed-off-by: David Howells --- rpc-api/yfs.xg | 62 +++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/rpc-api/yfs.xg b/rpc-api/yfs.xg index fb21682..e10cf1b 100644 --- a/rpc-api/yfs.xg +++ b/rpc-api/yfs.xg @@ -134,10 +134,10 @@ struct FS_AuthName { const FS_MAXNAMES = 4; typedef struct FS_AuthName FS_AuthNames; -RXYFS_GiveUpAllCallBacks( +GiveUpAllCallBacks( ) multi = 65539; -RXYFS_GetCapabilities( +GetCapabilities( OUT Capabilities *capabilities ) multi = 65540; @@ -145,7 +145,7 @@ typedef uint32_t RPCFlags; /* RPC Flags */ const RPC_FLAG_NOCALLBACK = 0x0001; -RXYFS_StoreData64( +StoreData64( IN RPCFlags Flags, IN YFSFid *Fid, IN YFSStoreStatus *InStatus, @@ -157,7 +157,7 @@ RXYFS_StoreData64( ) split = 64538; /* This uses the same text format in the opaques as RXAFS_FetchACL */ -RXYFS_FetchACL( +FetchACL( IN RPCFlags Flags, IN YFSFid *Fid, OUT AFSOpaque *AccessList, @@ -167,7 +167,7 @@ RXYFS_FetchACL( OUT YFSVolSync *Sync ) = 64131; -RXYFS_FetchStatus( +FetchStatus( IN RPCFlags Flags, IN YFSFid *Fid, OUT YFSFetchStatus *OutStatus, @@ -176,7 +176,7 @@ RXYFS_FetchStatus( ) = 64132; /* This uses the same text format in the opaque as RXAFS_StoreACL */ -RXYFS_StoreACL( +StoreACL( IN RPCFlags Flags, IN YFSFid *Fid, IN AFSOpaque *AccessList, @@ -184,7 +184,7 @@ RXYFS_StoreACL( OUT YFSVolSync *Sync ) = 64134; -RXYFS_StoreStatus( +StoreStatus( IN RPCFlags Flags, IN YFSFid *Fid, IN YFSStoreStatus *InStatus, @@ -192,7 +192,7 @@ RXYFS_StoreStatus( OUT YFSVolSync *Sync ) = 64135; -RXYFS_RemoveFile( +RemoveFile( IN RPCFlags Flags, IN YFSFid *DirFid, IN string Name, @@ -200,7 +200,7 @@ RXYFS_RemoveFile( OUT YFSVolSync *Sync ) = 64136; -RXYFS_CreateFile( +CreateFile( IN RPCFlags Flags, IN YFSFid *DirFid, IN string Name, @@ -213,7 +213,7 @@ RXYFS_CreateFile( OUT YFSVolSync *Sync ) = 64137; -RXYFS_Rename( +Rename( IN RPCFlags Flags, IN YFSFid *OldDirFid, IN string OldName, @@ -224,7 +224,7 @@ RXYFS_Rename( OUT YFSVolSync *Sync ) = 64138; -RXYFS_Symlink( +Symlink( IN RPCFlags Flags, IN YFSFid *DirFid, IN string Name, @@ -236,7 +236,7 @@ RXYFS_Symlink( OUT YFSVolSync *Sync ) = 64139; -RXYFS_Link( +Link( IN RPCFlags Flags, IN YFSFid *DirFid, IN string Name, @@ -246,7 +246,7 @@ RXYFS_Link( OUT YFSVolSync *Sync ) = 64140; -RXYFS_MakeDir( +MakeDir( IN RPCFlags Flags, IN YFSFid *DirFid, IN string Name, @@ -258,7 +258,7 @@ RXYFS_MakeDir( OUT YFSVolSync *Sync ) = 64141; -RXYFS_RemoveDir( +RemoveDir( IN RPCFlags Flags, IN YFSFid *DirFid, IN string Name, @@ -266,13 +266,13 @@ RXYFS_RemoveDir( OUT YFSVolSync *Sync ) = 64142; -RXYFS_GiveUpCallBacks( +GiveUpCallBacks( IN RPCFlags Flags, IN YFSCBFids *Fids_Array, IN YFSCBs *CallBacks_Array ) = 64147; -RXYFS_GetVolumeStatus( +GetVolumeStatus( IN RPCFlags Flags, IN YFSVolumeId Volumeid, OUT YFSFetchVolumeStatus *Volumestatus, @@ -281,7 +281,7 @@ RXYFS_GetVolumeStatus( OUT string Motd ) = 64149; -RXYFS_SetVolumeStatus( +SetVolumeStatus( IN RPCFlags Flags, IN YFSVolumeId Volumeid, IN YFSStoreVolumeStatus *Volumestatus, @@ -290,7 +290,7 @@ RXYFS_SetVolumeStatus( IN string Motd ) = 64150; -RXYFS_SetLock( +SetLock( IN RPCFlags Flags, IN YFSFid *Fid, IN ViceLockType Type, @@ -298,21 +298,21 @@ RXYFS_SetLock( OUT YFSVolSync *Sync ) = 64156; -RXYFS_ExtendLock( +ExtendLock( IN RPCFlags Flags, IN YFSFid *Fid, OUT YFSFetchStatus *OutStatus, OUT YFSVolSync *Sync ) = 64157; -RXYFS_ReleaseLock( +ReleaseLock( IN RPCFlags Flags, IN YFSFid *Fid, OUT YFSFetchStatus *OutStatus, OUT YFSVolSync *Sync ) = 64158; -RXYFS_Lookup( +Lookup( IN RPCFlags Flags, IN YFSFid *DirFid, IN string Name, @@ -323,7 +323,7 @@ RXYFS_Lookup( OUT YFSVolSync *Sync ) = 64161; -RXYFS_InlineBulkStatus( +InlineBulkStatus( IN RPCFlags Flags, IN YFSCBFids *FidsArray, OUT YFSBulkStats *StatArray, @@ -331,7 +331,7 @@ RXYFS_InlineBulkStatus( OUT YFSVolSync *Sync ) = 64536; -RXYFS_FetchData64( +FetchData64( IN RPCFlags Flags, IN YFSFid *Fid, IN YFSSize Pos, @@ -343,7 +343,7 @@ RXYFS_FetchData64( /* 64539 was the older UpdateSymlink */ -RXYFS_UpdateSymlink( +UpdateSymlink( IN RPCFlags Flags, IN YFSFid *SymlinkFid, IN string LinkContents, @@ -364,7 +364,7 @@ typedef endpoint eplist; /* 64164 was an older revision of WhoAmI */ -RXYFS_FlushCPS( +FlushCPS( IN RPCFlags Flags, IN YFSViceIds *IdsArray, IN eplist *endpoints @@ -379,7 +379,7 @@ const YFSOPAQUEACLMAX = 0x7FFF; typedef opaque YFSOpaqueACL ; /* Was code 64166 with ids in the xdr */ -RXYFS_FetchOpaqueACL( +FetchOpaqueACL( IN RPCFlags Flags, IN YFSFid *Fid, OUT YFSOpaqueACL *AclXdr, @@ -392,14 +392,14 @@ RXYFS_FetchOpaqueACL( /* Was code 64167 with ids in the xdr */ /* DEPRECATED -- replaced with StoreOpaqueACL2 -- CVE-2018-7168 */ -/* RXYFS_StoreOpaqueACL 64169; */ +/* StoreOpaqueACL 64169; */ -RXYFS_WhoAmI ( +WhoAmI ( IN RPCFlags Flags, OUT FS_AuthNames *names ) = 64170; -RXYFS_RemoveACL( +RemoveACL( IN RPCFlags Flags, IN YFSFid *DirFid, IN string Name, @@ -408,7 +408,7 @@ RXYFS_RemoveACL( ) = 64171; /* Was code 64172 without FileFid */ -RXYFS_RemoveFile2( +RemoveFile2( IN RPCFlags Flags, IN YFSFid *DirFid, IN string Name, @@ -420,7 +420,7 @@ RXYFS_RemoveFile2( /* Was code 64167 with ids in the xdr */ /* Was code 64169, replaced due to security issue CVE: 2018-7168 */ -RXYFS_StoreOpaqueACL2( +StoreOpaqueACL2( IN RPCFlags Flags, IN YFSFid *Fid, IN YFSOpaqueACL *AclXdr, -- 2.49.0