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 <dhowells@redhat.com>

diff --git a/rpc-api/bos.xg b/rpc-api/bos.xg
index be148c25a7235acc6081e47a91c5eddc2edc91e1..1720afe92a9fc23204e9e2aaed84c3d2578743fb 100644 (file)
--- a/rpc-api/bos.xg
+++ b/rpc-api/bos.xg
@@ -145,7 +145,7 @@ EnumerateInstance (IN uint32_t instance,
 
 GetInstanceInfo (IN string instance<BOZO_BSSIZE>,
                 OUT string type<BOZO_BSSIZE>,
-                OUT struct bozo_status *status) = 85;
+                OUT bozo_status *status) = 85;
 
 GetInstanceParm (IN string instance<BOZO_BSSIZE>,
                 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<BOZO_BSSIZE>) = 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<BOZO_BSSIZE>) split = 112;
 

diff --git a/rpc-api/cb.xg b/rpc-api/cb.xg
index 97716a5cda93b1c403f05c31c5e5dd971367a54b..acff0416ff52b0fc97622cf9992fb8341a82e9e5 100644 (file)
--- a/rpc-api/cb.xg
+++ b/rpc-api/cb.xg
@@ -150,5 +150,5 @@ GetCellByNum(IN  int32_t cellNumber,
             OUT string cellName<AFSNAMEMAX>,
             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 95d7ea0c24444cd00bac4ea28fc49bd393102d9c..bba65d55ffb2408e0684d4356a97576dc6b49e30 100644 (file)
--- 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 0e1a02d7f18562f63e5139b69d1f7542f0795c7f..9545f0b3e962153210e55c931c32d55be91940db 100644 (file)
--- a/rpc-api/pts.xg
+++ b/rpc-api/pts.xg
@@ -214,10 +214,10 @@ INewEntry(IN string name<PR_MAXNAMELEN>,
          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<PR_MAXNAMELEN>,

diff --git a/rpc-api/volumeserver.xg b/rpc-api/volumeserver.xg
index c7491cde040b7d6dbd14c48cf236a6aa4cb592ed..f574092955f239c0bd2f950740b0975150c7ec69 100644 (file)
--- 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;