xg: Strip AFSVol prefixes from RPC call names in volumeserver.xg

Strip AFSVol prefixes from RPC call names in volumeserver.xg as they're
redundant given that the the xg compiler prefixes them with the package
name.

Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/rpc-api/volumeserver.xg b/rpc-api/volumeserver.xg
index f574092955f239c0bd2f950740b0975150c7ec69..2e4dc9dd3e6de05ac7f439914d6085afa294b588 100644 (file)
--- a/rpc-api/volumeserver.xg
+++ b/rpc-api/volumeserver.xg
@@ -275,113 +275,113 @@ const AFS_MAX_DESTINATIONS = 255;
 
 typedef replica manyDests<AFS_MAX_DESTINATIONS>;
 
-AFSVolCreateVolume(IN uint32_t partition,
-                  IN string name<>,
-                  IN uint32_t type,
-                  IN uint32_t parent,
-                  INOUT uint32_t *volid,
-                  OUT uint32_t *trans) = VOLCREATEVOLUME;
+CreateVolume(IN uint32_t partition,
+            IN string name<>,
+            IN uint32_t type,
+            IN uint32_t parent,
+            INOUT uint32_t *volid,
+            OUT uint32_t *trans) = VOLCREATEVOLUME;
 
-AFSVolDeleteVolume(IN uint32_t trans) = VOLDELETEVOLUME;
+DeleteVolume(IN uint32_t trans) = VOLDELETEVOLUME;
 
-AFSVolNukeVolume(IN uint32_t partID,
-                IN uint32_t volID) = VOLNUKEVOLUME;
+NukeVolume(IN uint32_t partID,
+          IN uint32_t volID) = VOLNUKEVOLUME;
 
-AFSVolDump(IN uint32_t fromTrans,
-          IN uint32_t fromDate) split = VOLDUMP;
+Dump(IN uint32_t fromTrans,
+     IN uint32_t fromDate) split = VOLDUMP;
 
-AFSVolSignalRestore(IN string name<>,
-                   IN int32_t type,
-                   IN uint32_t pid,
-                   IN uint32_t cloneid) = VOLSIGNALRESTORE;
+SignalRestore(IN string name<>,
+             IN int32_t type,
+             IN uint32_t pid,
+             IN uint32_t cloneid) = VOLSIGNALRESTORE;
 
-AFSVolRestore(IN uint32_t toTrans,
-             IN uint32_t flags,
-             IN restoreCookie *cookie) split = VOLRESTORE;
+Restore(IN uint32_t toTrans,
+       IN uint32_t flags,
+       IN restoreCookie *cookie) split = VOLRESTORE;
 
-AFSVolForward(IN int32_t fromTrans,
-             IN int32_t fromData,
-             IN destServer *destination,
-             IN uint32_t destTrans,
-             IN restoreCookie *cookie) = VOLFORWARD;
+Forward(IN int32_t fromTrans,
+       IN int32_t fromData,
+       IN destServer *destination,
+       IN uint32_t destTrans,
+       IN restoreCookie *cookie) = VOLFORWARD;
 
-AFSVolClone(IN uint32_t trans,
-           IN uint32_t purgeVol,
-           IN uint32_t newType,
-           IN string newName<>,
-           INOUT uint32_t *newVol) = VOLCLONE;
+Clone(IN uint32_t trans,
+      IN uint32_t purgeVol,
+      IN uint32_t newType,
+      IN string newName<>,
+      INOUT uint32_t *newVol) = VOLCLONE;
 
-AFSVolReClone(IN uint32_t tid,
-             IN uint32_t cloneID) = VOLRECLONE;
+ReClone(IN uint32_t tid,
+       IN uint32_t cloneID) = VOLRECLONE;
 
-AFSVolSetForwarding(IN uint32_t tid,
-                   IN uint32_t newsite) = VOLSETFORWARDING;
+SetForwarding(IN uint32_t tid,
+             IN uint32_t newsite) = VOLSETFORWARDING;
 
-AFSVolTransCreate(IN uint32_t volume,
-                 IN uint32_t partition,
-                 IN uint32_t flags,
-                 OUT uint32_t *trans) = VOLTRANSCREATE;
+TransCreate(IN uint32_t volume,
+           IN uint32_t partition,
+           IN uint32_t flags,
+           OUT uint32_t *trans) = VOLTRANSCREATE;
 
-AFSVolEndTrans(IN uint32_t trans,
-              OUT uint32_t *rcode) = VOLENDTRANS;
+EndTrans(IN uint32_t trans,
+        OUT uint32_t *rcode) = VOLENDTRANS;
 
-AFSVolGetFlags(IN uint32_t trans,
-              OUT uint32_t *flags) = VOLGETFLAGS;
+GetFlags(IN uint32_t trans,
+        OUT uint32_t *flags) = VOLGETFLAGS;
 
-AFSVolSetFlags(IN uint32_t trans,
-              IN uint32_t flags) = VOLSETFLAGS;
+SetFlags(IN uint32_t trans,
+        IN uint32_t flags) = VOLSETFLAGS;
 
-AFSVolGetName(IN uint32_t tid,
-             OUT string tname<256>) = VOLGETNAME;
+GetName(IN uint32_t tid,
+       OUT string tname<256>) = VOLGETNAME;
 
-AFSVolGetStatus(IN uint32_t tid,
-               OUT volser_status *status) = VOLGETSTATUS;
+GetStatus(IN uint32_t tid,
+         OUT volser_status *status) = VOLGETSTATUS;
 
-AFSVolSetIdsTypes(IN uint32_t tId,
-                 IN string name<>,
-                 IN uint32_t type,
-                 IN uint32_t pId,
-                 IN uint32_t cloneId,
-                 IN uint32_t backupId) = VOLSETIDTYPES;
+SetIdsTypes(IN uint32_t tId,
+           IN string name<>,
+           IN uint32_t type,
+           IN uint32_t pId,
+           IN uint32_t cloneId,
+           IN uint32_t backupId) = VOLSETIDTYPES;
 
-AFSVolSetDate(IN uint32_t tid,
-             IN uint32_t newDate) = VOLSETDATE;
+SetDate(IN uint32_t tid,
+       IN uint32_t newDate) = VOLSETDATE;
 
-AFSVolListPartitions(OUT pIDs *partIDs) = VOLLISTPARTITIONS;
+ListPartitions(OUT pIDs *partIDs) = VOLLISTPARTITIONS;
 
-AFSVolPartitionInfo(IN string name<>,
-                   OUT diskPartition *partition) = VOLPARTITIONINFO;
+PartitionInfo(IN string name<>,
+             OUT diskPartition *partition) = VOLPARTITIONINFO;
 
-AFSVolListVolumes(IN uint32_t partID,
-                 IN uint32_t flags,
-                 OUT volEntries *resultEntries) = VOLLISTVOLUMES;
+ListVolumes(IN uint32_t partID,
+           IN uint32_t flags,
+           OUT volEntries *resultEntries) = VOLLISTVOLUMES;
 
-AFSVolListOneVolume(IN uint32_t partID,
-                   IN uint32_t volid,
-                   OUT volEntries *resultEntries) = VOLLISTONEVOLUME;
+ListOneVolume(IN uint32_t partID,
+             IN uint32_t volid,
+             OUT volEntries *resultEntries) = VOLLISTONEVOLUME;
 
-AFSVolGetNthVolume(IN uint32_t index,
-                  OUT uint32_t *volume,
-                  OUT uint32_t *partition) = VOLGETNTHVOLUME;
+GetNthVolume(IN uint32_t index,
+            OUT uint32_t *volume,
+            OUT uint32_t *partition) = VOLGETNTHVOLUME;
 
-AFSVolMonitor(OUT transDebugEntries *result) = VOLMONITOR;
+Monitor(OUT transDebugEntries *result) = VOLMONITOR;
 
-AFSVolXListVolumes(IN uint32_t partID,
-                  IN uint32_t flags,
-                  OUT xvolEntries *resultEntries) = VOLXLISTVOLUMES;
+XListVolumes(IN uint32_t partID,
+            IN uint32_t flags,
+            OUT xvolEntries *resultEntries) = VOLXLISTVOLUMES;
 
-AFSVolXListOneVolume(IN uint32_t partID,
-                    IN uint32_t volid,
-                    OUT xvolEntries *resultEntries) = VOLXLISTONEVOL;
+XListOneVolume(IN uint32_t partID,
+              IN uint32_t volid,
+              OUT xvolEntries *resultEntries) = VOLXLISTONEVOL;
 
-AFSVolSetInfo(IN uint32_t transid,
-             IN volintInfo *volinfo) = VOLSETINFO;
+SetInfo(IN uint32_t transid,
+       IN volintInfo *volinfo) = VOLSETINFO;
 
-AFSVolXListPartitions(OUT part_entries *ent) = VOLXLISTPARTITIONS;
+XListPartitions(OUT part_entries *ent) = VOLXLISTPARTITIONS;
 
-AFSVolForwardMultiple(IN int32_t fromTrans,
-                     IN int32_t fromData,
-                     IN manyDests *destinations,
-                     IN uint32_t spare0,
-                     IN restoreCookie *cookie,
-                     OUT multi_results *results) = VOLFORWARDMULTIPLE;
+ForwardMultiple(IN int32_t fromTrans,
+               IN int32_t fromData,
+               IN manyDests *destinations,
+               IN uint32_t spare0,
+               IN restoreCookie *cookie,
+               OUT multi_results *results) = VOLFORWARDMULTIPLE;