GCC4 signedness fixes

cvtnum and init_cvtnum take unsigned paramaters now

diff --git a/include/input.h b/include/input.h
index d7f8362953370a04d8bae71e0fd83b7d883e199d..be2bf74132763e2b3340d526331be8c35354e203 100644 (file)
--- a/include/input.h
+++ b/include/input.h
@@ -41,7 +41,8 @@ extern char   **breakline(char *input, int *count);
 extern void    doneline(char *input, char **vec);
 extern char    *fetchline(void);
 
-extern long long cvtnum(int blocksize, int sectorsize, char *s);
+extern long long cvtnum(unsigned int blocksize,
+                       unsigned int sectorsize, char *s);
 extern void    cvtstr(double value, char *str, size_t sz);
 extern unsigned long cvttime(char *s);
 

diff --git a/io/init.c b/io/init.c
index c1f81ff9ec7d8fcbf28918172a4c637cbe75e9a3..60fb024bde4a3575cb62f5f3d444ad1dc222131d 100644 (file)
--- a/io/init.c
+++ b/io/init.c
@@ -53,8 +53,8 @@ usage(void)
 
 void
 init_cvtnum(
-       int             *blocksize,
-       int             *sectsize)
+       unsigned int    *blocksize,
+       unsigned int    *sectsize)
 {
        if (!file || (file->flags & IO_FOREIGN)) {
                *blocksize = 4096;

diff --git a/io/init.h b/io/init.h
index 57b17a7650a2174ef7b54f4eab33d30fa5b40a8f..bc87165d23dc3d1614c651c9f1aac9eead76ccbc 100644 (file)
--- a/io/init.h
+++ b/io/init.h
@@ -42,4 +42,4 @@ extern struct timeval stopwatch;
 
 #define min(a,b)       (((a)<(b))?(a):(b))
 
-extern void init_cvtnum(int *blocksize, int *sectsize);
+extern void init_cvtnum(unsigned int *blocksize, unsigned int *sectsize);

diff --git a/io/madvise.c b/io/madvise.c
index a687c33cc9c77e81c0390b5a6e127407a858f2b7..d611fb107d440785327ebf7e9fe1ce5ab78edea1 100644 (file)
--- a/io/madvise.c
+++ b/io/madvise.c
@@ -69,8 +69,8 @@ madvise_f(
        off64_t         offset;
        size_t          length;
        void            *start;
-       int             advise = MADV_NORMAL;
-       int             c, blocksize, sectsize;
+       int             advise = MADV_NORMAL, c;
+       unsigned int    blocksize, sectsize;
 
        while ((c = getopt(argc, argv, "drsw")) != EOF) {
                switch (c) {

diff --git a/io/mincore.c b/io/mincore.c
index 80b4ac495e0d9c6a94257c7e8d0cdf64103cd41b..e182b954e9b44ef2339a2fde97a42f1bbcac837c 100644 (file)
--- a/io/mincore.c
+++ b/io/mincore.c
@@ -49,7 +49,8 @@ mincore_f(
        void            *start;
        void            *current, *previous;
        unsigned char   *vec;
-       int             i, blocksize, sectsize;
+       int             i;
+       unsigned int    blocksize, sectsize;
 
        if (argc == 1) {
                offset = mapping->offset;

diff --git a/io/mmap.c b/io/mmap.c
index 07c54c75bf0c2e8d45e1c869598a9f202ec93daa..cb7531d911c31cde70ec812cdd5c80abd4f4ea98 100644 (file)
--- a/io/mmap.c
+++ b/io/mmap.c
@@ -171,7 +171,7 @@ mmap_f(
        ssize_t         length;
        void            *address;
        char            *filename;
-       int             blocksize, sectsize;
+       unsigned int    blocksize, sectsize;
        int             c, prot = 0;
 
        if (argc == 1) {
@@ -286,7 +286,8 @@ msync_f(
        off64_t         offset;
        ssize_t         length;
        void            *start;
-       int             c, flags = 0, blocksize, sectsize;
+       int             c, flags = 0;
+       unsigned int    blocksize, sectsize;
 
        while ((c = getopt(argc, argv, "ais")) != EOF) {
                switch (c) {
@@ -391,8 +392,8 @@ mread_f(
        size_t          dumplen;
        char            *bp;
        void            *start;
-       int             dump = 0, rflag = 0;
-       int             c, blocksize, sectsize;
+       int             dump = 0, rflag = 0, c;
+       unsigned int    blocksize, sectsize;
 
        while ((c = getopt(argc, argv, "frv")) != EOF) {
                switch (c) {
@@ -537,7 +538,8 @@ mwrite_f(
        char            *sp;
        int             seed = 'X';
        int             rflag = 0;
-       int             c, blocksize, sectsize;
+       int             c;
+       unsigned int    blocksize, sectsize;
 
        while ((c = getopt(argc, argv, "rS:")) != EOF) {
                switch (c) {

diff --git a/io/open.c b/io/open.c
index 398e291fb4b0941dce8516e90644c870902ab66f..6a4bc3ec9e11bee935dde89db4a8e02424d4b74c 100644 (file)
--- a/io/open.c
+++ b/io/open.c
@@ -548,7 +548,7 @@ extsize_f(
 {
        struct fsxattr          fsx;
        long                    extsize;
-       int                     blocksize, sectsize;
+       unsigned int            blocksize, sectsize;
 
        init_cvtnum(&blocksize, &sectsize);
        extsize = (long)cvtnum(blocksize, sectsize, argv[1]);

diff --git a/io/pread.c b/io/pread.c
index 52b38ce3a8616d03440cb1a8658a12e1ba156fdd..3d5a014668200bff280c13ffd05a6757b4d58f38 100644 (file)
--- a/io/pread.c
+++ b/io/pread.c
@@ -149,7 +149,7 @@ pread_f(
 {
        off64_t         offset;
        long long       count, total;
-       int             blocksize, sectsize;
+       unsigned int    blocksize, sectsize;
        struct timeval  t1, t2;
        char            s1[64], s2[64], ts[64];
        int             Cflag, uflag, vflag;

diff --git a/io/prealloc.c b/io/prealloc.c
index f2fe83b1ab3179c4d284d4df8047230ceaa3e1d6..ae12f50453fef024f697cce33d42e959556e7e4f 100644 (file)
--- a/io/prealloc.c
+++ b/io/prealloc.c
@@ -47,7 +47,7 @@ offset_length(
        char            *length,
        xfs_flock64_t   *segment)
 {
-       int             blocksize, sectsize;
+       unsigned int    blocksize, sectsize;
 
        init_cvtnum(&blocksize, &sectsize);
        memset(segment, 0, sizeof(*segment));

diff --git a/io/pwrite.c b/io/pwrite.c
index f1d47c5fa8cad09744fa46f845839ec1ce988408..3ff05e846d2295e824666a0d299d8bafaf6cb0ea 100644 (file)
--- a/io/pwrite.c
+++ b/io/pwrite.c
@@ -106,7 +106,7 @@ pwrite_f(
        off64_t         offset, skip = 0;
        long long       count, total;
        unsigned int    seed = 0xcdcdcdcd;
-       int             blocksize, sectsize;
+       unsigned int    blocksize, sectsize;
        struct timeval  t1, t2;
        char            s1[64], s2[64], ts[64];
        char            *sp, *infile = NULL;

diff --git a/io/truncate.c b/io/truncate.c
index 1a9b2be78e4f709ed604e02a94d08fa4d3f177f6..1d9d6a41ae47e6f14445a79bd2d803cdfceabdf6 100644 (file)
--- a/io/truncate.c
+++ b/io/truncate.c
@@ -44,7 +44,7 @@ truncate_f(
        char            **argv)
 {
        off64_t         offset;
-       int             blocksize, sectsize;
+       unsigned int    blocksize, sectsize;
 
        init_cvtnum(&blocksize, &sectsize);
        offset = cvtnum(blocksize, sectsize, argv[1]);

diff --git a/libxcmd/input.c b/libxcmd/input.c
index 5758d8c2c7897d312f0fb5098b460346cebdb314..37bd8fb05fdc7a4bea64b06e6661c4b58fd556af 100644 (file)
--- a/libxcmd/input.c
+++ b/libxcmd/input.c
@@ -155,8 +155,8 @@ doneline(
 
 long long
 cvtnum(
-       int             blocksize,
-       int             sectorsize,
+       unsigned int    blocksize,
+       unsigned int    sectorsize,
        char            *s)
 {
        long long       i;

diff --git a/mkfs/proto.c b/mkfs/proto.c
index 4bde45bb8d8f9f9623ffd7c11961d0235f9f9592..318a0511cc2d0264c3d022479af60f8db4df9367 100644 (file)
--- a/mkfs/proto.c
+++ b/mkfs/proto.c
@@ -37,7 +37,6 @@
 /*
  * Prototypes for internal functions.
  */
-extern long long cvtnum(int blocksize, int sectorsize, char *s);
 extern void parseproto(xfs_mount_t *mp, xfs_inode_t *pip, char **pp,
        char *name); 
 static long getnum(char **pp);

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 8d17659134a824a55bc1b232540439083b5dd454..d4f7c95083e740f6380efbf65e4c4b15fc850110 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -516,7 +516,7 @@ main(
        xfs_btree_sblock_t      *block;
        int                     blflag;
        int                     blocklog;
-       int                     blocksize;
+       unsigned int            blocksize;
        int                     bsflag;
        int                     bsize;
        xfs_buf_t               *buf;
@@ -588,7 +588,7 @@ main(
        char                    *rtsize;
        xfs_sb_t                *sbp;
        int                     sectorlog;
-       int                     sectorsize;
+       unsigned int            sectorsize;
        int                     slflag;
        int                     ssflag;
        __uint64_t              tmp_agsize;
@@ -2381,8 +2381,8 @@ isdigits(
 
 long long
 cvtnum(
-       int             blocksize,
-       int             sectorsize,
+       unsigned int    blocksize,
+       unsigned int    sectorsize,
        char            *s)
 {
        long long       i;

diff --git a/mkfs/xfs_mkfs.h b/mkfs/xfs_mkfs.h
index 79387f9843503aedc75aa7879c75b1ff318fd02c..cda57b428e8903aa03019e7a625dba8bab661ce3 100644 (file)
--- a/mkfs/xfs_mkfs.h
+++ b/mkfs/xfs_mkfs.h
@@ -60,7 +60,8 @@
 /* xfs_mkfs.c */
 extern void usage (void);
 extern int isdigits (char *str);
-extern long long cvtnum (int blocksize, int sectorsize, char *s);
+extern long long cvtnum (unsigned int blocksize,
+                        unsigned int sectorsize, char *s);
 
 /* proto.c */
 extern char *setup_proto (char *fname);

diff --git a/quota/init.c b/quota/init.c
index b3ddeadca8a3a4b8386bfa085dd62bf17f20876d..3c52c40010f5b859bdb4014a65308015051dc91e 100644 (file)
--- a/quota/init.c
+++ b/quota/init.c
@@ -66,8 +66,8 @@ usage(void)
 
 void
 init_cvtnum(
-       int             *blocksize,
-       int             *sectsize)
+       unsigned int    *blocksize,
+       unsigned int    *sectsize)
 {
        *blocksize = 4096;
        *sectsize = 512;

diff --git a/quota/init.h b/quota/init.h
index 476f34b2363a298a8b27142f62d8042308e9cd91..773f943209f0716b30622c5113096b2c7b5963ab 100644 (file)
--- a/quota/init.h
+++ b/quota/init.h
@@ -43,4 +43,4 @@ extern void   quota_init(void);
 extern void    report_init(void);
 extern void    state_init(void);
 
-extern void init_cvtnum(int *, int *);
+extern void init_cvtnum(unsigned int *, unsigned int *);