mtd/util compr.c, 1.6, 1.7 flash_eraseall.c, 1.21, 1.22 flashcp.c, 1.4, 1.5 mkfs.jffs.c, 1.13, 1.14 mkfs.jffs2.c, 1.43, 1.44 nanddump.c, 1.26, 1.27 sumtool.c, 1.2, 1.3

[hvr at infradead.org]

Update of /home/cvs/mtd/util
In directory phoenix.infradead.org:/tmp/cvs-serv6979

Modified Files:
	compr.c flash_eraseall.c flashcp.c mkfs.jffs.c mkfs.jffs2.c 
	nanddump.c sumtool.c 
Log Message:

minor (compile) fixes wrt gcc-4.x



Index: compr.c
===================================================================
RCS file: /home/cvs/mtd/util/compr.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- compr.c	24 Jun 2004 09:52:57 -0000	1.6
+++ compr.c	17 Feb 2005 14:55:06 -0000	1.7
@@ -113,7 +113,7 @@
 
 /* Called before compression (if compression_check is setted) to prepare 
    the buffer for buffer overflow test */
-static void jffs2_decompression_test_prepare(char *buf, int size)
+static void jffs2_decompression_test_prepare(unsigned char *buf, int size)
 {
         memset(buf,JFFS2_BUFFER_FILL,size+1);
 }

Index: flash_eraseall.c
===================================================================
RCS file: /home/cvs/mtd/util/flash_eraseall.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- flash_eraseall.c	27 Jan 2005 10:05:01 -0000	1.21
+++ flash_eraseall.c	17 Feb 2005 14:55:06 -0000	1.22
@@ -54,7 +54,7 @@
 static void display_help (void);
 static void display_version (void);
 static struct jffs2_unknown_node cleanmarker;
-static int target_endian = __BYTE_ORDER;
+int target_endian = __BYTE_ORDER;
 
 int main (int argc, char *argv[])
 {

Index: flashcp.c
===================================================================
RCS file: /home/cvs/mtd/util/flashcp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flashcp.c	5 May 2004 20:46:28 -0000	1.4
+++ flashcp.c	17 Feb 2005 14:55:06 -0000	1.5
@@ -170,7 +170,8 @@
 {
    const char *progname,*filename = NULL,*device = NULL;
    int i,flags = FLAG_NONE;
-   size_t result,size,written;
+   ssize_t result;
+   size_t size,written;
    struct mtd_info_user mtd;
    struct erase_info_user erase;
    struct stat filestat;

Index: mkfs.jffs.c
===================================================================
RCS file: /home/cvs/mtd/util/mkfs.jffs.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mkfs.jffs.c	10 Nov 2004 19:46:15 -0000	1.13
+++ mkfs.jffs.c	17 Feb 2005 14:55:06 -0000	1.14
@@ -547,7 +547,7 @@
     else if (S_ISLNK(st.st_mode))
     {
       int linklen;
-      unsigned char *linkdata = (unsigned char *)malloc(1000);
+      char *linkdata = malloc(1000);
       if (!linkdata)
       {
         fprintf(stderr, "mkfs(): malloc() failed! (linkdata)\n");
@@ -562,7 +562,7 @@
       }
 
       write_val32(&f.inode.dsize, linklen);
-      f.data = linkdata;
+      f.data = (unsigned char *)linkdata;
       f.data[linklen] = '\0';
     }
     else if (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode))

Index: mkfs.jffs2.c
===================================================================
RCS file: /home/cvs/mtd/util/mkfs.jffs2.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mkfs.jffs2.c	26 Nov 2004 14:29:47 -0000	1.43
+++ mkfs.jffs2.c	17 Feb 2005 14:55:07 -0000	1.44
@@ -101,7 +101,7 @@
 static int squash_uids = 0;
 static int squash_perms = 0;
 static int fake_times = 0;
-static int target_endian = __BYTE_ORDER;
+int target_endian = __BYTE_ORDER;
 static const char *const app_name = "mkfs.jffs2";
 static const char *const memory_exhausted = "memory exhausted";
 

Index: nanddump.c
===================================================================
RCS file: /home/cvs/mtd/util/nanddump.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nanddump.c	2 Dec 2004 19:27:54 -0000	1.26
+++ nanddump.c	17 Feb 2005 14:55:07 -0000	1.27
@@ -157,7 +157,7 @@
 	int i, fd, ofd, bs, badblock = 0;
 	struct mtd_oob_buf oob = {0, 16, oobbuf};
 	mtd_info_t meminfo;
-	unsigned char pretty_buf[80];
+	char pretty_buf[80];
 
  	process_options(argc, argv);
 

Index: sumtool.c
===================================================================
RCS file: /home/cvs/mtd/util/sumtool.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sumtool.c	5 Jan 2005 08:33:07 -0000	1.2
+++ sumtool.c	17 Feb 2005 14:55:07 -0000	1.3
@@ -68,7 +68,7 @@
 static int cleanmarker_size = sizeof(cleanmarker);
 static const char *short_options = "o:i:e:hvVblnc:p";
 static int erase_block_size = 65536;
-static int target_endian = __BYTE_ORDER;
+int target_endian = __BYTE_ORDER;
 static int out_fd = -1;
 static int in_fd = -1;