From a7836dda8c1aab18c937c7e8909d4d9a678a53fa 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(). Change-Id: I367e984d1777fcc8a3ec81b501174fae2fd0c8ff Reviewed-on: http://gerrit.openafs.org/3590 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Simon Wilkinson Reviewed-by: Jeffrey Altman --- 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 62501ff31..d40e2e9ba 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -4430,8 +4430,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; } @@ -4626,10 +4626,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 */ @@ -4981,8 +4978,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; } @@ -5083,8 +5079,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