[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs attrdef.c, 1.5, 1.6 boot.c, 1.3, 1.4 ntfsclone.c, 1.96, 1.97 ntfscmp.c, 1.21, 1.22 ntfsfix.c, 1.36, 1.37 ntfsresize.c, 1.128, 1.129

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv1448/ntfsprogs

Modified Files:
	attrdef.c boot.c ntfsclone.c ntfscmp.c ntfsfix.c ntfsresize.c 
Log Message:
more sparse fixes
left only endianness and this stupid problems with s64


Index: attrdef.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/attrdef.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- attrdef.c	26 Oct 2005 20:47:14 -0000	1.5
+++ attrdef.c	12 Dec 2006 19:00:01 -0000	1.6
@@ -1,3 +1,5 @@
+#include "attrdef.h"
+
 /**
  * attrdef_ntfs12_array
  */

Index: boot.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/boot.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- boot.c	26 Oct 2005 20:47:14 -0000	1.3
+++ boot.c	12 Dec 2006 19:00:01 -0000	1.4
@@ -1,3 +1,5 @@
+#include "boot.h"
+
 /**
  * boot_array - the first 3429 bytes of $Boot
  * The first 3429 bytes of $Boot. The rest is just zero. Total 8192 bytes.

Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- ntfsclone.c	3 Dec 2006 18:26:58 -0000	1.96
+++ ntfsclone.c	12 Dec 2006 19:00:01 -0000	1.97
@@ -95,7 +95,7 @@ static const char *dirty_volume_msg =
 "Volume '%s' is scheduled for a check or it was shutdown \n"
 "uncleanly. Please boot Windows or use the --force option to progress.\n";
 
-struct {
+static struct {
 	int verbose;
 	int quiet;
 	int debug;
@@ -139,19 +139,19 @@ struct ntfs_walk_cluster {
 };
 
 
-ntfs_volume *vol = NULL;
-struct bitmap lcn_bitmap;
+static ntfs_volume *vol = NULL;
+static struct bitmap lcn_bitmap;
 
-int fd_in;
-int fd_out;
-FILE *msg_out = NULL;
-
-int wipe = 0;
-unsigned int nr_used_mft_records   = 0;
-unsigned int wiped_unused_mft_data = 0;
-unsigned int wiped_unused_mft      = 0;
-unsigned int wiped_resident_data   = 0;
-unsigned int wiped_timestamp_data  = 0;
+static int fd_in;
+static int fd_out;
+static FILE *msg_out = NULL;
+
+static int wipe = 0;
+static unsigned int nr_used_mft_records   = 0;
+static unsigned int wiped_unused_mft_data = 0;
+static unsigned int wiped_unused_mft      = 0;
+static unsigned int wiped_resident_data   = 0;
+static unsigned int wiped_timestamp_data  = 0;
 
 static BOOL image_is_host_endian = FALSE;
 
@@ -176,7 +176,7 @@ static BOOL image_is_host_endian = FALSE
 #define NTFSCLONE_IMG_VER_MINOR	0
 
 /* All values are in little endian. */
-struct {
+static struct {
 	char magic[IMAGE_MAGIC_SIZE];
 	u8 major_ver;
 	u8 minor_ver;
@@ -1406,7 +1406,7 @@ static void mount_volume(unsigned long n
 			  volume_size(vol, vol->nr_clusters));
 }
 
-struct ntfs_walk_cluster backup_clusters = { NULL, NULL };
+static struct ntfs_walk_cluster backup_clusters = { NULL, NULL };
 
 static int device_offset_valid(int fd, s64 ofs)
 {

Index: ntfscmp.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ntfscmp.c	12 Nov 2006 22:46:50 -0000	1.21
+++ ntfscmp.c	12 Dec 2006 19:00:01 -0000	1.22
@@ -39,7 +39,7 @@ static const char *hibernated_volume_msg
 "turned off properly\n";
 
 
-struct {
+static struct {
 	int debug;
 	int show_progress;
 	int verbose;
@@ -309,7 +309,7 @@ static inline s64 get_nr_mft_records(ntf
 #define  NTFSCMP_EXTENSION_RECORD		4
 #define  NTFSCMP_INODE_CLOSE_ERROR		5
 
-const char *ntfscmp_errs[] = {
+static const char *ntfscmp_errs[] = {
 	"OK",
 	"INODE_OPEN_ERROR",
 	"INODE_OPEN_IO_ERROR",

Index: ntfsfix.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ntfsfix.c	11 Dec 2006 10:41:34 -0000	1.36
+++ ntfsfix.c	12 Dec 2006 19:00:01 -0000	1.37
@@ -83,7 +83,7 @@ static const char *EXEC_NAME = "ntfsfix"
 static const char *OK        = "OK\n";
 static const char *FAILED    = "FAILED\n";
 
-struct {
+static struct {
 	char *volume;
 } opt;
 

Index: ntfsresize.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- ntfsresize.c	11 Dec 2006 10:41:34 -0000	1.128
+++ ntfsresize.c	12 Dec 2006 19:00:01 -0000	1.129
@@ -125,7 +125,7 @@ static const char *many_bad_sectors_msg 
 "* other reason. We suggest to get a replacement disk as soon as possible. *\n"
 "***************************************************************************\n";
 
-struct {
+static struct {
 	int verbose;
 	int debug;
 	int ro_flag;
@@ -200,7 +200,7 @@ typedef struct {
 
 /* FIXME: This, lcn_bitmap and pos from find_free_cluster() will make a cluster
    allocation related structure, attached to ntfs_resize_t */
-s64 max_free_cluster_range = 0;
+static s64 max_free_cluster_range = 0;
 
 #define NTFS_MBYTE (1000 * 1000)