[Parted-commits] GNU Parted Official Repository: Changes to 'master'

[Jim Meyering]

 libparted/fs/fat/table.c |   27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit f6f692326e2ae9af9f7625e7725f65e14850b714
Author: Jim Meyering <meyering at redhat.com>
Date:   Thu Jun 26 14:37:43 2008 +0200

    * libparted/fs/fat/table.c: Remove a few trailing blanks.

diff --git a/libparted/fs/fat/table.c b/libparted/fs/fat/table.c
index 1c8b5ff..ba8335a 100644
--- a/libparted/fs/fat/table.c
+++ b/libparted/fs/fat/table.c
@@ -291,7 +291,7 @@ fat_table_set (FatTable* ft, FatCluster cluster, FatCluster value)
 	return 1;
 }
 
-FatCluster 
+FatCluster
 fat_table_get (const FatTable* ft, FatCluster cluster)
 {
 	if (cluster >= ft->cluster_count + 2) {
@@ -420,7 +420,7 @@ fat_table_set_eof (FatTable* ft, FatCluster cluster)
 
 		case FAT_TYPE_FAT16:
 		return fat_table_set (ft, cluster, 0xfff8);
-        
+
 		case FAT_TYPE_FAT32:
 		return fat_table_set (ft, cluster, 0x0fffffff);
 	}
@@ -443,7 +443,7 @@ fat_table_set_bad (FatTable* ft, FatCluster cluster)
 
 		case FAT_TYPE_FAT16:
 		return fat_table_set (ft, cluster, 0xfff7);
-        
+
 		case FAT_TYPE_FAT32:
 		return fat_table_set (ft, cluster, 0x0ffffff7);
 	}
@@ -478,4 +478,3 @@ fat_table_entry_size (FatType fat_type)
 
 	return 0;
 }
-

commit a602d826e2e069b628c22b64ecd1e959fb35638f
Author: Jim Meyering <meyering at redhat.com>
Date:   Thu Jun 26 14:37:05 2008 +0200

    avoid a warning from gcc -Wshadow
    
    * libparted/fs/fat/table.c (fat_table_duplicate): Rename local
    s/dup/dup_ft/ to avoid shadowing the function.

diff --git a/libparted/fs/fat/table.c b/libparted/fs/fat/table.c
index 0182bfc..1c8b5ff 100644
--- a/libparted/fs/fat/table.c
+++ b/libparted/fs/fat/table.c
@@ -1,6 +1,6 @@
 /*
     libparted
-    Copyright (C) 1998, 1999, 2000, 2007 Free Software Foundation, Inc.
+    Copyright (C) 1998-2000, 2007-2008 Free Software Foundation, Inc.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -58,19 +58,19 @@ fat_table_destroy (FatTable* ft)
 FatTable*
 fat_table_duplicate (const FatTable* ft)
 {
-	FatTable*	dup;
+	FatTable*	dup_ft;
 
-	dup = fat_table_new (ft->fat_type, ft->size);
-	if (!dup) return NULL;
+	dup_ft = fat_table_new (ft->fat_type, ft->size);
+	if (!dup_ft) return NULL;
 
-	dup->cluster_count	= ft->cluster_count;
-	dup->free_cluster_count	= ft->free_cluster_count;
-	dup->bad_cluster_count	= ft->bad_cluster_count;
-	dup->last_alloc		= ft->last_alloc;
+	dup_ft->cluster_count	= ft->cluster_count;
+	dup_ft->free_cluster_count	= ft->free_cluster_count;
+	dup_ft->bad_cluster_count	= ft->bad_cluster_count;
+	dup_ft->last_alloc		= ft->last_alloc;
 
-	memcpy (dup->table, ft->table, ft->raw_size);
+	memcpy (dup_ft->table, ft->table, ft->raw_size);
 
-	return dup;
+	return dup_ft;
 }
 
 void