"Normalize" some types, s/long unsigned/unsigned long/ etc.
authorSascha Wildner <saw@online.de>
Tue, 29 Jul 2014 20:45:27 +0000 (22:45 +0200)
committerSascha Wildner <saw@online.de>
Tue, 29 Jul 2014 20:45:27 +0000 (22:45 +0200)
Just like the rest of our tree is doing it.

include/rpc/pmap_prot.h
include/rpcsvc/pmap_prot.x
lib/libc/xdr/xdr_rec.c
sys/dev/netif/ath/ath/if_ath_beacon.c
sys/dev/raid/mrsas/mrsas_fp.c
sys/dev/raid/mrsas/mrsas_ioctl.c

index f8a689f..4c4256a 100644 (file)
@@ -29,7 +29,6 @@
  *     from: @(#)pmap_prot.h   2.1 88/07/29 4.0 RPCSRC
  * $NetBSD: pmap_prot.h,v 1.8 2000/06/02 22:57:55 fvdl Exp $
  * $FreeBSD: src/include/rpc/pmap_prot.h,v 1.12 2002/03/23 17:24:55 imp Exp $
- * $DragonFly: src/include/rpc/pmap_prot.h,v 1.3 2003/11/14 01:01:50 dillon Exp $
  */
 
 /*
@@ -51,7 +50,7 @@
  *     TRUE is success, FALSE is failure.  Un-registers pair
  *     [prog, vers].  prot and port are ignored.
  *
- * PMAPPROC_GETPORT(struct pmap) returns (long unsigned).
+ * PMAPPROC_GETPORT(struct pmap) returns (unsigned long).
  *     0 is failure.  Otherwise returns the port number where the pair
  *     [prog, vers] is registered.  It may lie!
  *
 #define PMAPPROC_CALLIT                ((u_long)5)
 
 struct pmap {
-       long unsigned pm_prog;
-       long unsigned pm_vers;
-       long unsigned pm_prot;
-       long unsigned pm_port;
+       unsigned long pm_prog;
+       unsigned long pm_vers;
+       unsigned long pm_prot;
+       unsigned long pm_port;
 };
 
 struct pmaplist {
index c3a6f03..56d5719 100644 (file)
@@ -28,7 +28,6 @@
 % *
 % * @(#)pmap_prot.x    1.6     94/04/29 SMI
 % * $FreeBSD: src/include/rpcsvc/pmap_prot.x,v 1.3 2003/05/04 02:51:42 obrien Exp $
-% * $DragonFly: src/include/rpcsvc/pmap_prot.x,v 1.2 2003/06/17 04:25:58 dillon Exp $
 % */
 %/*
 % * Copyright (c) 1984,1989 by Sun Microsystems, Inc.
@@ -65,7 +64,7 @@
 % *    TRUE is success, FALSE is failure.  Un-registers pair
 % *    [prog, vers].  prot and port are ignored.
 % *
-% * PMAPPROC_GETPORT(struct pmap) returns (long unsigned).
+% * PMAPPROC_GETPORT(struct pmap) returns (unsigned long).
 % *    0 is failure.  Otherwise returns the port number where the pair
 % *    [prog, vers] is registered.  It may lie!
 % *
@@ -254,10 +253,10 @@ program PMAPPROG {
 %#define       PMAPPORT 111
 %
 %struct pmap {
-%      long unsigned pm_prog;
-%      long unsigned pm_vers;
-%      long unsigned pm_prot;
-%      long unsigned pm_port;
+%      unsigned long pm_prog;
+%      unsigned long pm_vers;
+%      unsigned long pm_prot;
+%      unsigned long pm_port;
 %};
 %typedef struct pmap PMAP;
 %extern bool_t xdr_pmap (XDR *, struct pmap *);
index dc366fd..1c46ac8 100644 (file)
@@ -93,7 +93,7 @@ static const struct  xdr_ops xdrrec_ops = {
 /*
  * A record is composed of one or more record fragments.
  * A record fragment is a four-byte header followed by zero to
- * 2**32-1 bytes.  The header is treated as a long unsigned and is
+ * 2**32-1 bytes.  The header is treated as an unsigned long and is
  * encode/decoded to the network via htonl/ntohl.  The low order 31 bits
  * are a byte count of the fragment.  The highest order bit is a boolean:
  * 1 => this fragment is the last fragment of the record,
index bd54409..54bbc0c 100644 (file)
@@ -240,7 +240,7 @@ ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_node *ni)
                    "%s: %s beacons bslot %d intval %u tsfadjust %llu\n",
                    __func__, sc->sc_stagbeacons ? "stagger" : "burst",
                    avp->av_bslot, ni->ni_intval,
-                   (long long unsigned) le64toh(tsfadjust));
+                   (unsigned long long) le64toh(tsfadjust));
 
                wh = mtod(m, struct ieee80211_frame *);
                memcpy(&wh[1], &tsfadjust, sizeof(tsfadjust));
index 0b4b76d..8eda71f 100644 (file)
@@ -316,17 +316,17 @@ static int getSpanInfo(MR_FW_RAID_MAP_ALL *map, PLD_SPAN_INFO ldSpanInfo)
                                (unsigned int)span_set->span_row_data_width, 
                                (unsigned int)span_set->diff);
                        kprintf("    logical LBA start=0x%08lx, end=0x%08lx\n", 
-                               (long unsigned int)span_set->log_start_lba, 
-                               (long unsigned int)span_set->log_end_lba);
+                               (unsigned long)span_set->log_start_lba, 
+                               (unsigned long)span_set->log_end_lba);
                        kprintf("       span row start=0x%08lx, end=0x%08lx\n",
-                               (long unsigned int)span_set->span_row_start, 
-                               (long unsigned int)span_set->span_row_end);
+                               (unsigned long)span_set->span_row_start, 
+                               (unsigned long)span_set->span_row_end);
                        kprintf("       data row start=0x%08lx, end=0x%08lx\n", 
-                               (long unsigned int)span_set->data_row_start, 
-                               (long unsigned int)span_set->data_row_end);
+                               (unsigned long)span_set->data_row_start, 
+                               (unsigned long)span_set->data_row_end);
                        kprintf("       data strip start=0x%08lx, end=0x%08lx\n", 
-                               (long unsigned int)span_set->data_strip_start, 
-                               (long unsigned int)span_set->data_strip_end);
+                               (unsigned long)span_set->data_strip_start, 
+                               (unsigned long)span_set->data_strip_end);
                        
                        for (span=0; span<raid->spanDepth; span++) {
                                if (map->raidMap.ldSpanMap[ld].spanBlock[span].
@@ -337,10 +337,10 @@ static int getSpanInfo(MR_FW_RAID_MAP_ALL *map, PLD_SPAN_INFO ldSpanInfo)
                                kprintf("  Span=%x, Quad=%x, diff=%x\n", span, 
                                        element, quad->diff);
                                kprintf("    offset_in_span=0x%08lx\n", 
-                                       (long unsigned int)quad->offsetInSpan);
+                                       (unsigned long)quad->offsetInSpan);
                                kprintf("     logical start=0x%08lx, end=0x%08lx\n", 
-                                       (long unsigned int)quad->logStart, 
-                                       (long unsigned int)quad->logEnd);
+                                       (unsigned long)quad->logStart, 
+                                       (unsigned long)quad->logEnd);
                                }
                        }
                }
@@ -523,7 +523,7 @@ static u_int64_t get_strip_from_row(struct mrsas_softc *sc,
                        }
        }
        mrsas_dprint(sc, MRSAS_PRL11,"LSI Debug - get_strip_from_row: returns invalid "
-               "strip for ld=%x, row=%lx\n", ld, (long unsigned int)row);
+               "strip for ld=%x, row=%lx\n", ld, (unsigned long)row);
        return -1;
 }
 
@@ -573,12 +573,12 @@ static u_int32_t get_arm_from_strip(struct mrsas_softc *sc,
                        }
                mrsas_dprint(sc, MRSAS_PRL11, "LSI PRL11: get_arm_from_strip: "
                        " for ld=0x%x strip=0x%lx arm is  0x%x\n", ld, 
-                       (long unsigned int)strip, (strip_offset - span_offset));
+                       (unsigned long)strip, (strip_offset - span_offset));
                return (strip_offset - span_offset);
        }
 
        mrsas_dprint(sc, MRSAS_PRL11, "LSI Debug: - get_arm_from_strip: returns invalid arm"
-               " for ld=%x strip=%lx\n", ld, (long unsigned int)strip);
+               " for ld=%x strip=%lx\n", ld, (unsigned long)strip);
 
        return -1;
 }
index 88b730a..f3caae4 100644 (file)
@@ -95,7 +95,7 @@ void mrsas_dump_dcmd( struct mrsas_softc *sc, struct mrsas_dcmd_frame* dcmd )
         device_printf(sc->mrsas_dev, "    sge32[%02d].length:    0x%08x\n", 
             i, dcmd->sgl.sge32[i].length);
         device_printf(sc->mrsas_dev, "    sge64[%02d].phys_addr: 0x%08llx\n",
-            i, (long long unsigned int) dcmd->sgl.sge64[i].phys_addr);
+            i, (unsigned long long) dcmd->sgl.sge64[i].phys_addr);
         device_printf(sc->mrsas_dev, "    sge64[%02d].length:    0x%08x\n", 
             i, dcmd->sgl.sge64[i].length);
     }