From: Alex Elder <aelder@sgi.com>
Date: Wed, 28 Sep 2011 11:44:34 +0000 (+0000)
Subject: xfsprogs: xfs_quota: kill local variable "type" from free_f()
X-Git-Tag: v3.1.6~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12a204130247910dc14bc5141aac8eaf1e10b6df;p=thirdparty%2Fxfsprogs-dev.git

xfsprogs: xfs_quota: kill local variable "type" from free_f()

Only one value is ever really used for the  "type" variable in
free_f(), and it indicates that either type of entry in fs_table
is wanted.  Just get rid of the variable and make use of the
ability to provide 0 to fs_cursor_initialise() to indicate that.

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/quota/free.c b/quota/free.c
index 71a7cb296..79b52e910 100644
--- a/quota/free.c
+++ b/quota/free.c
@@ -297,14 +297,13 @@ static void
 free_space_list(
 	FILE			*fp,
 	uint			form,
-	uint			type,
 	char			*dir,
 	uint			flags)
 {
 	fs_cursor_t		cursor;
 	fs_path_t		*path;
 
-	fs_cursor_initialise(dir, type, &cursor);
+	fs_cursor_initialise(dir, 0, &cursor);
 	while ((path = fs_cursor_next_entry(&cursor))) {
 		if (free_space(fp, form, path, flags))
 			flags |= NO_HEADER_FLAG;
@@ -318,7 +317,7 @@ free_f(
 {
 	FILE		*fp = NULL;
 	char		*fname = NULL;
-	int		c, flags = 0, form = 0, type = 0;
+	int		c, flags = 0, form = 0;
 
 	while ((c = getopt(argc, argv, "bf:hNir")) != EOF) {
 		switch (c) {
@@ -348,16 +347,13 @@ free_f(
 	if (!form)
 		form = XFS_BLOCK_QUOTA;
 
-	if (!type)
-		type = FS_MOUNT_POINT|FS_PROJECT_PATH;
-
 	if ((fp = fopen_write_secure(fname)) == NULL)
 		return 0;
 
 	if (argc == optind)
-		free_space_list(fp, form, type, NULL, flags);
+		free_space_list(fp, form, NULL, flags);
 	else while (argc > optind)
-		free_space_list(fp, form, type, argv[optind++], flags);
+		free_space_list(fp, form, argv[optind++], flags);
 
 	if (fname)
 		fclose(fp);