fdisk, display, hexdump.h: Use standard C types instead of u_int, u_char, u_long...

Signed-off-by: Josiah Worcester <josiahw@gmail.com>

diff --git a/fdisk/fdiskbsdlabel.c b/fdisk/fdiskbsdlabel.c
index 0c3810d47b53592e1f16c04a58df1fd0bbba0d9d..d379b70abc191925fb4acf34380896fc2930fc7b 100644 (file)
--- a/fdisk/fdiskbsdlabel.c
+++ b/fdisk/fdiskbsdlabel.c
@@ -71,7 +71,7 @@ static void xbsd_change_fstype (void);
 static int xbsd_get_part_index (int max);
 static int xbsd_check_new_partition (int *i);
 static void xbsd_list_types (void);
-static u_short xbsd_dkcksum (struct xbsd_disklabel *lp);
+static unsigned short xbsd_dkcksum (struct xbsd_disklabel *lp);
 static int xbsd_initlabel  (struct partition *p, struct xbsd_disklabel *d,
                            int pindex);
 static int xbsd_readlabel  (struct partition *p, struct xbsd_disklabel *d);
@@ -463,28 +463,28 @@ xbsd_edit_disklabel (void)
   d = &xbsd_dlabel;
 
 #if defined (__alpha__) || defined (__ia64__)
-  d -> d_secsize    = (u_long) edit_int ((u_long) d -> d_secsize     ,_("bytes/sector"));
-  d -> d_nsectors   = (u_long) edit_int ((u_long) d -> d_nsectors    ,_("sectors/track"));
-  d -> d_ntracks    = (u_long) edit_int ((u_long) d -> d_ntracks     ,_("tracks/cylinder"));
-  d -> d_ncylinders = (u_long) edit_int ((u_long) d -> d_ncylinders  ,_("cylinders"));
+  d -> d_secsize    = (unsigned long) edit_int ((unsigned long) d -> d_secsize     ,_("bytes/sector"));
+  d -> d_nsectors   = (unsigned long) edit_int ((unsigned long) d -> d_nsectors    ,_("sectors/track"));
+  d -> d_ntracks    = (unsigned long) edit_int ((unsigned long) d -> d_ntracks     ,_("tracks/cylinder"));
+  d -> d_ncylinders = (unsigned long) edit_int ((unsigned long) d -> d_ncylinders  ,_("cylinders"));
 #endif
 
   /* d -> d_secpercyl can be != d -> d_nsectors * d -> d_ntracks */
   while (1)
   {
-    d -> d_secpercyl = (u_long) edit_int ((u_long) d -> d_nsectors * d -> d_ntracks,
+    d -> d_secpercyl = (unsigned long) edit_int ((unsigned long) d -> d_nsectors * d -> d_ntracks,
                                          _("sectors/cylinder"));
     if (d -> d_secpercyl <= d -> d_nsectors * d -> d_ntracks)
       break;
 
     printf (_("Must be <= sectors/track * tracks/cylinder (default).\n"));
   }
-  d -> d_rpm        = (u_short) edit_int ((u_short) d -> d_rpm       ,_("rpm"));
-  d -> d_interleave = (u_short) edit_int ((u_short) d -> d_interleave,_("interleave"));
-  d -> d_trackskew  = (u_short) edit_int ((u_short) d -> d_trackskew ,_("trackskew"));
-  d -> d_cylskew    = (u_short) edit_int ((u_short) d -> d_cylskew   ,_("cylinderskew"));
-  d -> d_headswitch = (u_long) edit_int ((u_long) d -> d_headswitch  ,_("headswitch"));
-  d -> d_trkseek    = (u_long) edit_int ((u_long) d -> d_trkseek     ,_("track-to-track seek"));
+  d -> d_rpm        = (unsigned short) edit_int ((unsigned short) d -> d_rpm       ,_("rpm"));
+  d -> d_interleave = (unsigned short) edit_int ((unsigned short) d -> d_interleave,_("interleave"));
+  d -> d_trackskew  = (unsigned short) edit_int ((unsigned short) d -> d_trackskew ,_("trackskew"));
+  d -> d_cylskew    = (unsigned short) edit_int ((unsigned short) d -> d_cylskew   ,_("cylinderskew"));
+  d -> d_headswitch = (unsigned long) edit_int ((unsigned long) d -> d_headswitch  ,_("headswitch"));
+  d -> d_trkseek    = (unsigned long) edit_int ((unsigned long) d -> d_trkseek     ,_("track-to-track seek"));
 
   d -> d_secperunit = d -> d_secpercyl * d -> d_ncylinders;
 }
@@ -638,13 +638,13 @@ xbsd_list_types (void) {
        list_types (xbsd_fstypes);
 }
 
-static u_short
+static unsigned short
 xbsd_dkcksum (struct xbsd_disklabel *lp) {
-       u_short *start, *end;
-       u_short sum = 0;
+       unsigned short *start, *end;
+       unsigned short sum = 0;
   
-       start = (u_short *) lp;
-       end = (u_short *) &lp->d_partitions[lp->d_npartitions];
+       start = (unsigned short *) lp;
+       end = (unsigned short *) &lp->d_partitions[lp->d_npartitions];
        while (start < end)
                sum ^= *start++;
        return sum;

diff --git a/text-utils/display.c b/text-utils/display.c
index 01805a20feab7969493f070b32abf3f93b111221..c700b02791ea008f9b75f5c442721fe947183143 100644 (file)
--- a/text-utils/display.c
+++ b/text-utils/display.c
@@ -55,11 +55,11 @@ static off_t address;                       /* address/offset in stream */
 static off_t eaddress;                 /* end address */
 
 static inline void
-print(PR *pr, u_char *bp) {
+print(PR *pr, unsigned char *bp) {
 
        switch(pr->flags) {
        case F_ADDRESS:
-               (void)printf(pr->fmt, (quad_t)address);
+               (void)printf(pr->fmt, (int64_t)address);
                break;
        case F_BPAD:
                (void)printf(pr->fmt, "");
@@ -90,23 +90,23 @@ print(PR *pr, u_char *bp) {
            {
                short sval;     /* int16_t */
                int ival;       /* int32_t */
-               long long Lval; /* int64_t, quad_t */
+               long long Lval; /* int64_t, int64_t */
 
                switch(pr->bcnt) {
                case 1:
-                       (void)printf(pr->fmt, (quad_t)*bp);
+                       (void)printf(pr->fmt, (int64_t)*bp);
                        break;
                case 2:
                        memmove(&sval, bp, sizeof(sval));
-                       (void)printf(pr->fmt, (quad_t)sval);
+                       (void)printf(pr->fmt, (int64_t)sval);
                        break;
                case 4:
                        memmove(&ival, bp, sizeof(ival));
-                       (void)printf(pr->fmt, (quad_t)ival);
+                       (void)printf(pr->fmt, (int64_t)ival);
                        break;
                case 8:
                        memmove(&Lval, bp, sizeof(Lval));
-                       (void)printf(pr->fmt, (quad_t)Lval);
+                       (void)printf(pr->fmt, (int64_t)Lval);
                        break;
                }
                break;
@@ -127,23 +127,23 @@ print(PR *pr, u_char *bp) {
            {
                unsigned short sval;    /* u_int16_t */
                unsigned int ival;      /* u_int32_t */
-               unsigned long long Lval;/* u_int64_t, u_quad_t */
+               unsigned long long Lval;/* u_int64_t, u_int64_t */
 
                switch(pr->bcnt) {
                case 1:
-                       (void)printf(pr->fmt, (u_quad_t)*bp);
+                       (void)printf(pr->fmt, (uint64_t)*bp);
                        break;
                case 2:
                        memmove(&sval, bp, sizeof(sval));
-                       (void)printf(pr->fmt, (u_quad_t)sval);
+                       (void)printf(pr->fmt, (uint64_t)sval);
                        break;
                case 4:
                        memmove(&ival, bp, sizeof(ival));
-                       (void)printf(pr->fmt, (u_quad_t)ival);
+                       (void)printf(pr->fmt, (uint64_t)ival);
                        break;
                case 8:
                        memmove(&Lval, bp, sizeof(Lval));
-                       (void)printf(pr->fmt, (u_quad_t)Lval);
+                       (void)printf(pr->fmt, (uint64_t)Lval);
                        break;
                }
                break;
@@ -174,9 +174,9 @@ void display(void)
        register FU *fu;
        register PR *pr;
        register int cnt;
-       register u_char *bp;
+       register unsigned char *bp;
        off_t saveaddress;
-       u_char savech = 0, *savebp;
+       unsigned char savech = 0, *savebp;
 
        while ((bp = get()) != NULL)
            for (fs = fshead, savebp = bp, saveaddress = address; fs;
@@ -212,7 +212,7 @@ void display(void)
                for (pr = endfu->nextpr; pr; pr = pr->nextpr)
                        switch(pr->flags) {
                        case F_ADDRESS:
-                               (void)printf(pr->fmt, (quad_t)eaddress);
+                               (void)printf(pr->fmt, (int64_t)eaddress);
                                break;
                        case F_TEXT:
                                (void)printf("%s", pr->fmt);
@@ -261,7 +261,7 @@ get(void)
                        eaddress = address + nread;
                        return(curp);
                }
-               n = fread((char *)curp + nread, sizeof(u_char),
+               n = fread((char *)curp + nread, sizeof(unsigned char),
                    length == -1 ? need : MIN(length, need), stdin);
                if (!n) {
                        if (ferror(stdin))

diff --git a/text-utils/hexdump.h b/text-utils/hexdump.h
index 3df8629a388ab7c7eeea97b1222b819425fcec7d..52a64bfe9caf9aa79a92350e66261460f983a69c 100644 (file)
--- a/text-utils/hexdump.h
+++ b/text-utils/hexdump.h
@@ -46,7 +46,7 @@ typedef struct _pr {
 #define        F_U             0x100           /* %_u */
 #define        F_UINT          0x200           /* %[ouXx] */
 #define        F_TEXT          0x400           /* no conversions */
-       u_int flags;                    /* flag values */
+       unsigned int flags;             /* flag values */
        int bcnt;                       /* byte count */
        char *cchar;                    /* conversion character */
        char *fmt;                      /* printf format */
@@ -58,7 +58,7 @@ typedef struct _fu {
        struct _pr *nextpr;             /* next print unit */
 #define        F_IGNORE        0x01            /* %_A */
 #define        F_SETREP        0x02            /* rep count set, not default */
-       u_int flags;                    /* flag values */
+       unsigned int flags;             /* flag values */
        int reps;                       /* repetition count */
        int bcnt;                       /* byte count */
        char *fmt;                      /* format string */