From 27ca2e30f6b57a9ddcb4caa4df85e2f17ee463b7 Mon Sep 17 00:00:00 2001 From: David Howells Date: Thu, 26 Sep 2019 11:09:14 +0100 Subject: [PATCH] xg: Remove 'struct' from argument type specifications Remove 'struct' from argument type specifications as it's not used consistently and it seems it should be dispensible. Signed-off-by: David Howells --- rpc-api/bos.xg | 12 ++++++------ rpc-api/cb.xg | 2 +- rpc-api/ka.xg | 12 ++++++------ rpc-api/pts.xg | 4 ++-- rpc-api/volumeserver.xg | 18 +++++++++--------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/rpc-api/bos.xg b/rpc-api/bos.xg index be148c2..1720afe 100644 --- a/rpc-api/bos.xg +++ b/rpc-api/bos.xg @@ -145,7 +145,7 @@ EnumerateInstance (IN uint32_t instance, GetInstanceInfo (IN string instance, OUT string type, - OUT struct bozo_status *status) = 85; + OUT bozo_status *status) = 85; GetInstanceParm (IN string instance, IN uint32_t num, @@ -160,11 +160,11 @@ ListSUsers (IN uint32_t an, ListKeys (IN uint32_t an, OUT uint32_t *kvno, - OUT struct bozo_key *key, - OUT struct bozo_keyInfo *keinfo) = 90; + OUT bozo_key *key, + OUT bozo_keyInfo *keinfo) = 90; AddKey (IN uint32_t an, - IN struct bozo_key *key) = 91; + IN bozo_key *key) = 91; DeleteKey (IN uint32_t an) = 92; @@ -212,12 +212,12 @@ Exec (IN string cmd) = 108; Prune (IN uint32_t flags) = 109; SetRestartTime (IN uint32_t type, - IN struct bozo_netKTime *restartTime) = 110; + IN bozo_netKTime *restartTime) = 110; GetRestartTime (IN uint32_t type, - OUT struct bozo_netKTime *restartTime) = 111; + OUT bozo_netKTime *restartTime) = 111; GetLog(IN string name) split = 112; diff --git a/rpc-api/cb.xg b/rpc-api/cb.xg index 97716a5..acff041 100644 --- a/rpc-api/cb.xg +++ b/rpc-api/cb.xg @@ -150,5 +150,5 @@ GetCellByNum(IN int32_t cellNumber, OUT string cellName, OUT serverList *cellHosts) = 65537; -TellMeAboutYourself(OUT struct interfaceAddr *addr, +TellMeAboutYourself(OUT interfaceAddr *addr, OUT Capabilities *capabilities) = 65538; diff --git a/rpc-api/ka.xg b/rpc-api/ka.xg index 95d7ea0..bba65d5 100644 --- a/rpc-api/ka.xg +++ b/rpc-api/ka.xg @@ -215,16 +215,16 @@ package KAT_ GetTicket_old (IN int32_t kvno, IN kaname auth_domain, - IN struct ka_CBS *aticket, + IN ka_CBS *aticket, IN kaname name, IN kaname instance, - IN struct ka_CBS *atimes, - INOUT struct ka_BBS *oanswer) = 3; + IN ka_CBS *atimes, + INOUT ka_BBS *oanswer) = 3; GetTicket (IN int32_t kvno, IN kaname auth_domain, - IN struct ka_CBS *aticket, + IN ka_CBS *aticket, IN kaname name, IN kaname instance, - IN struct ka_CBS *atimes, - INOUT struct ka_BBS *oanswer) = 23; + IN ka_CBS *atimes, + INOUT ka_BBS *oanswer) = 23; diff --git a/rpc-api/pts.xg b/rpc-api/pts.xg index 0e1a02d..9545f0b 100644 --- a/rpc-api/pts.xg +++ b/rpc-api/pts.xg @@ -214,10 +214,10 @@ INewEntry(IN string name, IN int32_t oid) = 500; ListEntry(IN int32_t id, - OUT struct prcheckentry *entry) = 512; + OUT prcheckentry *entry) = 512; DumpEntry(IN uint32_t pos, - OUT struct prdebugentry *entry) = 502; + OUT prdebugentry *entry) = 502; ChangeEntry(IN int32_t id, IN string name, diff --git a/rpc-api/volumeserver.xg b/rpc-api/volumeserver.xg index c7491cd..f574092 100644 --- a/rpc-api/volumeserver.xg +++ b/rpc-api/volumeserver.xg @@ -301,9 +301,9 @@ AFSVolRestore(IN uint32_t toTrans, AFSVolForward(IN int32_t fromTrans, IN int32_t fromData, - IN struct destServer *destination, + IN destServer *destination, IN uint32_t destTrans, - IN struct restoreCookie *cookie) = VOLFORWARD; + IN restoreCookie *cookie) = VOLFORWARD; AFSVolClone(IN uint32_t trans, IN uint32_t purgeVol, @@ -347,18 +347,18 @@ AFSVolSetIdsTypes(IN uint32_t tId, AFSVolSetDate(IN uint32_t tid, IN uint32_t newDate) = VOLSETDATE; -AFSVolListPartitions(OUT struct pIDs *partIDs) = VOLLISTPARTITIONS; +AFSVolListPartitions(OUT pIDs *partIDs) = VOLLISTPARTITIONS; AFSVolPartitionInfo(IN string name<>, - OUT struct diskPartition *partition) = VOLPARTITIONINFO; + OUT diskPartition *partition) = VOLPARTITIONINFO; AFSVolListVolumes(IN uint32_t partID, IN uint32_t flags, - OUT struct volEntries *resultEntries) = VOLLISTVOLUMES; + OUT volEntries *resultEntries) = VOLLISTVOLUMES; AFSVolListOneVolume(IN uint32_t partID, IN uint32_t volid, - OUT struct volEntries *resultEntries) = VOLLISTONEVOLUME; + OUT volEntries *resultEntries) = VOLLISTONEVOLUME; AFSVolGetNthVolume(IN uint32_t index, OUT uint32_t *volume, @@ -368,11 +368,11 @@ AFSVolMonitor(OUT transDebugEntries *result) = VOLMONITOR; AFSVolXListVolumes(IN uint32_t partID, IN uint32_t flags, - OUT struct xvolEntries *resultEntries) = VOLXLISTVOLUMES; + OUT xvolEntries *resultEntries) = VOLXLISTVOLUMES; AFSVolXListOneVolume(IN uint32_t partID, IN uint32_t volid, - OUT struct xvolEntries *resultEntries) = VOLXLISTONEVOL; + OUT xvolEntries *resultEntries) = VOLXLISTONEVOL; AFSVolSetInfo(IN uint32_t transid, IN volintInfo *volinfo) = VOLSETINFO; @@ -383,5 +383,5 @@ AFSVolForwardMultiple(IN int32_t fromTrans, IN int32_t fromData, IN manyDests *destinations, IN uint32_t spare0, - IN struct restoreCookie *cookie, + IN restoreCookie *cookie, OUT multi_results *results) = VOLFORWARDMULTIPLE; -- 2.49.0