From d8f4635333dabc59cecdba602b14971b6b2da0b0 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 24 Dec 2010 10:06:05 -0500 Subject: [PATCH] vos: free ubulkentries with xdr_free Instead of using free() to free the ubulkentries data structure use xdr_free(). Reviewed-on: http://gerrit.openafs.org/3590 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Simon Wilkinson Reviewed-by: Jeffrey Altman (cherry picked from commit a7836dda8c1aab18c937c7e8909d4d9a678a53fa) Change-Id: I9af8aee92e0e187923ccd952a5487ea419446720 Reviewed-on: http://gerrit.openafs.org/3626 Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/volser/vos.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/volser/vos.c b/src/volser/vos.c index ca1549bd0..2c55983c3 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -4425,8 +4425,8 @@ DeleteEntry(struct cmd_syndesc *as, void *arock) fprintf(STDOUT, "Total VLDB entries deleted: %lu; failed to delete: %lu\n", (unsigned long)totalBack, (unsigned long)totalFail); - if (arrayEntries.ubulkentries_val) - free(arrayEntries.ubulkentries_val); + + xdr_free((xdrproc_t) xdr_ubulkentries, &arrayEntries); return 0; } @@ -4621,10 +4621,7 @@ ListVLDB(struct cmd_syndesc *as, void *arock) } /* Free the bulk array */ - if (arrayEntries.ubulkentries_val) { - free(arrayEntries.ubulkentries_val); - arrayEntries.ubulkentries_val = 0; - } + xdr_free((xdrproc_t) xdr_ubulkentries, &arrayEntries); } /* Here is where we now sort all the entries and print them */ @@ -4976,8 +4973,7 @@ BackSys(struct cmd_syndesc *as, void *arock) fprintf(STDOUT, "Total volumes backed up: %lu; failed to backup: %lu\n", (unsigned long)totalBack, (unsigned long)totalFail); fflush(STDOUT); - if (arrayEntries.ubulkentries_val) - free(arrayEntries.ubulkentries_val); + xdr_free((xdrproc_t) xdr_ubulkentries, &arrayEntries); return 0; } @@ -5078,8 +5074,7 @@ UnlockVLDB(struct cmd_syndesc *as, void *arock) } } - if (arrayEntries.ubulkentries_val) - free(arrayEntries.ubulkentries_val); + xdr_free((xdrproc_t) xdr_ubulkentries, &arrayEntries); return 0; } -- 2.39.5