vos: Abstract out bulk list conversion

Pull the various segments of code that do bulk list conversion into
their own functions. This is purely code reorganisation at this point,
fixes for these functions will follow in subsequent patches.

Change-Id: I941e94aaf776ece85f041d02f5bdbaad5cf5b129
Reviewed-on: http://gerrit.openafs.org/3595
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/src/volser/vsutils.c b/src/volser/vsutils.c
index 3a3092a207c6062bc110ff2d20263af5aeba0614..b9f9ad2fb94bc55836f82a444d67c6d5e571529e 100644 (file)
--- a/src/volser/vsutils.c
+++ b/src/volser/vsutils.c
@@ -417,6 +417,42 @@ VLDB_ReplaceEntryU(afs_uint32 volid, afs_int32 voltype, struct uvldbentry *entry
     return code;
 }
 
+static void
+convertBulkToNBulk(bulkentries *bulk, nbulkentries *nbulk, int *entriesp) {
+    int i;
+
+    nbulk->nbulkentries_val =
+       (nvldbentry *) xdr_alloc(*entriesp * sizeof(struct nvldbentry));
+
+    for (i = 0; i < *entriesp; i++) {  /* process each entry */
+       ovlentry_to_nvlentry(&bulk->bulkentries_val[i],
+                            &nbulk->nbulkentries_val[i]);
+    }
+}
+
+static void
+convertBulkToUBulk(bulkentries *bulk, ubulkentries *ubulk, int *entriesp) {
+    int i;
+
+    ubulk->ubulkentries_val =
+       (uvldbentry *) xdr_alloc(*entriesp * sizeof(struct uvldbentry));
+    for (i = 0; i < *entriesp; i++) {  /* process each entry */
+       ovlentry_to_uvlentry(&bulk->bulkentries_val[i],
+                            &ubulk->ubulkentries_val[i]);
+    }
+}
+
+static void
+convertNBulkToUBulk(nbulkentries *nbulk, ubulkentries *ubulk, int *entriesp) {
+    int i;
+
+    ubulk->ubulkentries_val =
+        (uvldbentry *) xdr_alloc(*entriesp * sizeof(struct uvldbentry));
+    for (i = 0; i < *entriesp; i++) {  /* process each entry */
+        nvlentry_to_uvlentry(&nbulk->nbulkentries_val[i],
+                             &ubulk->ubulkentries_val[i]);
+    }
+}
 
 int
 VLDB_ListAttributes(VldbListByAttributes *attrp,
@@ -426,21 +462,16 @@ VLDB_ListAttributes(VldbListByAttributes *attrp,
     int code;
 
     if (newvlserver == vltype_old) {
-        int i;
         bulkentries arrayEntries;
       tryold:
        memset(&arrayEntries, 0, sizeof(arrayEntries)); /*initialize to hint the stub  to alloc space */
        code =
            ubik_VL_ListAttributes(cstruct, 0, attrp, entriesp,
                      &arrayEntries);
-       if (!code) {
-           blkentriesp->nbulkentries_val =
-               (nvldbentry *) xdr_alloc(*entriesp * sizeof(struct nvldbentry));
-           for (i = 0; i < *entriesp; i++) {   /* process each entry */
-               ovlentry_to_nvlentry(&arrayEntries.bulkentries_val[i],
-                                    &blkentriesp->nbulkentries_val[i]);
-           }
-       }
+
+       if (!code)
+           convertBulkToNBulk(&arrayEntries, blkentriesp, entriesp);
+
        if (arrayEntries.bulkentries_val)
            xdr_free((xdrproc_t) xdr_bulkentries, &arrayEntries);
        return code;
@@ -461,7 +492,7 @@ VLDB_ListAttributesU(VldbListByAttributes *attrp,
                     ubulkentries *blkentriesp)
 {
     nbulkentries narrayEntries;
-    int code, i;
+    int code;
 
     if (newvlserver == vltype_old) {
         bulkentries arrayEntries;
@@ -470,14 +501,9 @@ VLDB_ListAttributesU(VldbListByAttributes *attrp,
        code =
            ubik_VL_ListAttributes(cstruct, 0, attrp, entriesp,
                      &arrayEntries);
-       if (!code) {
-           blkentriesp->ubulkentries_val =
-               (uvldbentry *) xdr_alloc(*entriesp * sizeof(struct uvldbentry));
-           for (i = 0; i < *entriesp; i++) {   /* process each entry */
-               ovlentry_to_uvlentry(&arrayEntries.bulkentries_val[i],
-                                    &blkentriesp->ubulkentries_val[i]);
-           }
-       }
+       if (!code)
+           convertBulkToUBulk(&arrayEntries, blkentriesp, entriesp);
+
        if (arrayEntries.bulkentries_val)
            xdr_free((xdrproc_t) xdr_bulkentries, &arrayEntries);
        return code;
@@ -491,12 +517,8 @@ VLDB_ListAttributesU(VldbListByAttributes *attrp,
         goto tryold;
     }
     if (!code) {
-        blkentriesp->ubulkentries_val =
-            (uvldbentry *) xdr_alloc(*entriesp * sizeof(struct uvldbentry));
-        for (i = 0; i < *entriesp; i++) {      /* process each entry */
-            nvlentry_to_uvlentry(&narrayEntries.nbulkentries_val[i],
-                                 &blkentriesp->ubulkentries_val[i]);
-        }
+       convertNBulkToUBulk(&narrayEntries, blkentriesp, entriesp);
+
     }
     if (narrayEntries.nbulkentries_val)
         xdr_free((xdrproc_t) xdr_bulkentries, &narrayEntries);
@@ -530,7 +552,6 @@ VLDB_ListAttributesN2U(VldbListByAttributes *attrp,
                       afs_int32 *nextindexp)
 {
     afs_int32 code = RXGEN_OPCODE;
-    int i;
 
     if (newvlserver != vltype_old) {
         nbulkentries narrayEntries;
@@ -539,14 +560,9 @@ VLDB_ListAttributesN2U(VldbListByAttributes *attrp,
         code =
             ubik_VL_ListAttributesN2(cstruct, 0, attrp, (name ? name : ""),
                                      thisindex, nentriesp, &narrayEntries, nextindexp);
-        if (!code) {
-           blkentriesp->ubulkentries_val =
-               (uvldbentry *) xdr_alloc(*nentriesp * sizeof(struct uvldbentry));
-           for (i = 0; i < *nentriesp; i++) {  /* process each entry */
-               nvlentry_to_uvlentry(&narrayEntries.nbulkentries_val[i],
-                                    &blkentriesp->ubulkentries_val[i]);
-           }
-       }
+        if (!code)
+           convertNBulkToUBulk(&narrayEntries, blkentriesp, nentriesp);
+
        if (narrayEntries.nbulkentries_val)
            xdr_free((xdrproc_t) xdr_bulkentries, &narrayEntries);
        return code;