From 9df53e7288581dd0ddda21e24799cefc802616f4 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sun, 12 Aug 2018 14:57:36 +0200 Subject: [PATCH] style: lib: remove useless reference to 'int' in integral types * lib/abitset.c, lib/bbitset.h, lib/bitset.c, lib/bitset.h, * lib/bitset_stats.c, lib/bitsetv-print.c, lib/bitsetv.c, * lib/bitsetv.h, lib/ebitset.c, lib/lbitset.c, lib/timevar.c, * lib/vbitset.c: Prefer 'unsigned' to 'unsigned int'. Likewise for long and short. --- lib/abitset.c | 4 ++-- lib/bbitset.h | 4 ++-- lib/bitset.c | 10 +++++----- lib/bitset.h | 6 +++--- lib/bitset_stats.c | 44 +++++++++++++++++++++---------------------- lib/bitsetv-print.c | 2 +- lib/bitsetv.c | 6 +++--- lib/bitsetv.h | 2 +- lib/ebitset.c | 16 ++++++++-------- lib/lbitset.c | 20 ++++++++++---------- lib/timevar.c | 4 ++-- lib/vbitset.c | 46 ++++++++++++++++++++++----------------------- 12 files changed, 82 insertions(+), 82 deletions(-) diff --git a/lib/abitset.c b/lib/abitset.c index e4e926bb..830fdefc 100644 --- a/lib/abitset.c +++ b/lib/abitset.c @@ -146,7 +146,7 @@ abitset_list_reverse (bitset src, bitset_bindex *list, bitset_bindex rbitno; bitset_bindex count; bitset_windex windex; - unsigned int bitcnt; + unsigned bitcnt; bitset_bindex bitoff; bitset_word *srcp = ABITSET_WORDS (src); bitset_bindex n_bits = BITSET_SIZE_ (src); @@ -302,7 +302,7 @@ abitset_list (bitset src, bitset_bindex *list, static inline void abitset_unused_clear (bitset dst) { - unsigned int last_bit; + unsigned last_bit; last_bit = BITSET_SIZE_ (dst) % BITSET_WORD_BITS; if (last_bit) diff --git a/lib/bbitset.h b/lib/bbitset.h index 77efd35e..d0e7c17c 100644 --- a/lib/bbitset.h +++ b/lib/bbitset.h @@ -50,8 +50,8 @@ extern const char * const bitset_type_names[]; enum bitset_alloc_type {BITSET_MALLOC, BITSET_OBALLOC}; /* Data type used to store a word of bits. */ -typedef unsigned long int bitset_word; -#define BITSET_WORD_BITS ((unsigned int) (CHAR_BIT * sizeof (bitset_word))) +typedef unsigned long bitset_word; +#define BITSET_WORD_BITS ((unsigned) (CHAR_BIT * sizeof (bitset_word))) /* Bit index. In theory we might need a type wider than size_t, but in practice we lose at most a factor of CHAR_BIT by going with diff --git a/lib/bitset.c b/lib/bitset.c index 9d081ed3..97a60ef4 100644 --- a/lib/bitset.c +++ b/lib/bitset.c @@ -101,7 +101,7 @@ bitset_init (bitset bset, bitset_bindex n_bits, enum bitset_type type) specified by ATTR. For variable size bitsets, N_BITS is only a hint and may be zero. */ enum bitset_type -bitset_type_choose (bitset_bindex n_bits ATTRIBUTE_UNUSED, unsigned int attr) +bitset_type_choose (bitset_bindex n_bits ATTRIBUTE_UNUSED, unsigned attr) { /* Check attributes. */ if (attr & BITSET_FIXED && attr & BITSET_VARIABLE) @@ -169,7 +169,7 @@ bitset_obstack_alloc (struct obstack *bobstack, /* Create a bitset of N_BITS and with attribute hints specified by ATTR. */ bitset -bitset_create (bitset_bindex n_bits, unsigned int attr) +bitset_create (bitset_bindex n_bits, unsigned attr) { enum bitset_type type; @@ -291,13 +291,13 @@ bitset_only_set_p (bitset src, bitset_bindex bitno) static void bitset_print (FILE *file, bitset bset, bool verbose) { - unsigned int pos; + unsigned pos; bitset_bindex i; bitset_iterator iter; if (verbose) fprintf (file, "n_bits = %lu, set = {", - (unsigned long int) bitset_size (bset)); + (unsigned long) bitset_size (bset)); pos = 30; BITSET_FOR_EACH (iter, bset, i, 0) @@ -308,7 +308,7 @@ bitset_print (FILE *file, bitset bset, bool verbose) pos = 0; } - fprintf (file, "%lu ", (unsigned long int) i); + fprintf (file, "%lu ", (unsigned long) i); pos += 1 + (i >= 10) + (i >= 100); }; diff --git a/lib/bitset.h b/lib/bitset.h index 817ffe98..48bd2300 100644 --- a/lib/bitset.h +++ b/lib/bitset.h @@ -40,7 +40,7 @@ enum bitset_attr {BITSET_FIXED = 1, /* Bitset size fixed. */ BITSET_FRUGAL = 16, /* Prefer most compact. */ BITSET_GREEDY = 32}; /* Prefer fastest at memory expense. */ -typedef unsigned int bitset_attrs; +typedef unsigned bitset_attrs; /* The contents of the union should be considered to be private. While I would like to make this union opaque, it needs to be @@ -310,7 +310,7 @@ extern void bitset_dump (FILE *, bitset); BITSET_FOR_EACH (iter, src, i, 0) { - printf ("%lu ", (unsigned long int) i); + printf ("%lu ", (unsigned long) i); }; */ #define BITSET_FOR_EACH(ITER, BSET, INDEX, MIN) \ @@ -332,7 +332,7 @@ extern void bitset_dump (FILE *, bitset); BITSET_FOR_EACH_REVERSE (iter, src, i, 0) { - printf ("%lu ", (unsigned long int) i); + printf ("%lu ", (unsigned long) i); }; */ #define BITSET_FOR_EACH_REVERSE(ITER, BSET, INDEX, MIN) \ diff --git a/lib/bitset_stats.c b/lib/bitset_stats.c index 6fa2c53f..dc8aae50 100644 --- a/lib/bitset_stats.c +++ b/lib/bitset_stats.c @@ -77,23 +77,23 @@ struct bitset_type_info_struct { - unsigned int allocs; - unsigned int frees; - unsigned int lists; - unsigned int sets; - unsigned int cache_sets; - unsigned int resets; - unsigned int cache_resets; - unsigned int tests; - unsigned int cache_tests; - unsigned int list_counts[BITSET_LOG_COUNT_BINS]; - unsigned int list_sizes[BITSET_LOG_SIZE_BINS]; - unsigned int list_density[BITSET_DENSITY_BINS]; + unsigned allocs; + unsigned frees; + unsigned lists; + unsigned sets; + unsigned cache_sets; + unsigned resets; + unsigned cache_resets; + unsigned tests; + unsigned cache_tests; + unsigned list_counts[BITSET_LOG_COUNT_BINS]; + unsigned list_sizes[BITSET_LOG_SIZE_BINS]; + unsigned list_density[BITSET_DENSITY_BINS]; }; struct bitset_stats_info_struct { - unsigned int runs; + unsigned runs; struct bitset_type_info_struct types[BITSET_TYPE_NUM]; }; @@ -106,10 +106,10 @@ bool bitset_stats_enabled = false; /* Print a percentage histogram with message MSG to FILE. */ static void bitset_percent_histogram_print (FILE *file, const char *name, const char *msg, - unsigned int n_bins, unsigned int *bins) + unsigned n_bins, unsigned *bins) { - unsigned int i; - unsigned int total; + unsigned i; + unsigned total; total = 0; for (i = 0; i < n_bins; i++) @@ -130,11 +130,11 @@ bitset_percent_histogram_print (FILE *file, const char *name, const char *msg, /* Print a log histogram with message MSG to FILE. */ static void bitset_log_histogram_print (FILE *file, const char *name, const char *msg, - unsigned int n_bins, unsigned int *bins) + unsigned n_bins, unsigned *bins) { - unsigned int i; - unsigned int total; - unsigned int max_width; + unsigned i; + unsigned total; + unsigned max_width; total = 0; for (i = 0; i < n_bins; i++) @@ -149,7 +149,7 @@ bitset_log_histogram_print (FILE *file, const char *name, const char *msg, n_bins = i; /* 2 * ceil (log10 (2) * (N - 1)) + 1. */ - max_width = 2 * (unsigned int) (0.30103 * (n_bins - 1) + 0.9999) + 1; + max_width = 2 * (unsigned) (0.30103 * (n_bins - 1) + 0.9999) + 1; fprintf (file, "%s %s", name, msg); for (i = 0; i < 2; i++) @@ -158,7 +158,7 @@ bitset_log_histogram_print (FILE *file, const char *name, const char *msg, for (; i < n_bins; i++) fprintf (file, "%*lu-%lu\t%8u (%5.1f%%)\n", - max_width - ((unsigned int) (0.30103 * (i) + 0.9999) + 1), + max_width - ((unsigned) (0.30103 * (i) + 0.9999) + 1), 1UL << (i - 1), (1UL << i) - 1, bins[i], diff --git a/lib/bitsetv-print.c b/lib/bitsetv-print.c index 6041c302..798a81ac 100644 --- a/lib/bitsetv-print.c +++ b/lib/bitsetv-print.c @@ -54,7 +54,7 @@ bitsetv_matrix_dump (FILE * out, const char *title, bitsetv bset) /* Contents. */ for (i = 0; bset[i]; ++i) { - fprintf (out, "%2lu|", (unsigned long int) i); + fprintf (out, "%2lu|", (unsigned long) i); for (j = 0; j < hsize; ++j) fputs (bitset_test (bset[i], j) ? "1" : " ", out); fputs ("|\n", out); diff --git a/lib/bitsetv.c b/lib/bitsetv.c index d4728f1a..1d3213bf 100644 --- a/lib/bitsetv.c +++ b/lib/bitsetv.c @@ -62,7 +62,7 @@ bitsetv_alloc (bitset_bindex n_vecs, bitset_bindex n_bits, /* Create a vector of N_VECS bitsets, each of N_BITS, and with attribute hints specified by ATTR. */ bitset * -bitsetv_create (bitset_bindex n_vecs, bitset_bindex n_bits, unsigned int attr) +bitsetv_create (bitset_bindex n_vecs, bitset_bindex n_bits, unsigned attr) { enum bitset_type type; @@ -146,7 +146,7 @@ bitsetv_dump (FILE *file, char const *title, char const *subtitle, fprintf (file, "%s\n", title); for (i = 0; bsetv[i]; i++) { - fprintf (file, "%s %lu\n", subtitle, (unsigned long int) i); + fprintf (file, "%s %lu\n", subtitle, (unsigned long) i); bitset_dump (file, bsetv[i]); } @@ -161,7 +161,7 @@ debug_bitsetv (bitsetv bsetv) for (i = 0; bsetv[i]; i++) { - fprintf (stderr, "%lu: ", (unsigned long int) i); + fprintf (stderr, "%lu: ", (unsigned long) i); debug_bitset (bsetv[i]); } diff --git a/lib/bitsetv.h b/lib/bitsetv.h index 672cbf18..56e0de7d 100644 --- a/lib/bitsetv.h +++ b/lib/bitsetv.h @@ -31,7 +31,7 @@ extern bitsetv bitsetv_alloc (bitset_bindex, bitset_bindex, enum bitset_type); /* Create a vector of N_VECS bitsets, each of N_BITS, and with attribute hints specified by ATTR. */ -extern bitsetv bitsetv_create (bitset_bindex, bitset_bindex, unsigned int); +extern bitsetv bitsetv_create (bitset_bindex, bitset_bindex, unsigned); /* Free vector of bitsets. */ extern void bitsetv_free (bitsetv); diff --git a/lib/ebitset.c b/lib/ebitset.c index e4bdf33b..06da3cc6 100644 --- a/lib/ebitset.c +++ b/lib/ebitset.c @@ -52,7 +52,7 @@ /* Number of bits stored in each element. */ #define EBITSET_ELT_BITS \ - ((unsigned int) (EBITSET_ELT_WORDS * BITSET_WORD_BITS)) + ((unsigned) (EBITSET_ELT_WORDS * BITSET_WORD_BITS)) /* Ebitset element. We use an array of bits. */ typedef struct ebitset_elt_struct @@ -433,7 +433,7 @@ ebitset_equal_p (bitset dst, bitset src) for (j = 0; j < EBITSET_SIZE (src); j++) { - unsigned int i; + unsigned i; ebitset_elt *selt = selts[j]; ebitset_elt *delt = delts[j]; @@ -570,7 +570,7 @@ ebitset_list_reverse (bitset bset, bitset_bindex *list, bitset_bindex n_bits; bitset_bindex bitno; bitset_bindex rbitno; - unsigned int bcount; + unsigned bcount; bitset_bindex boffset; bitset_windex windex; bitset_windex eindex; @@ -836,7 +836,7 @@ ebitset_list (bitset bset, bitset_bindex *list, static inline void ebitset_unused_clear (bitset dst) { - unsigned int last_bit; + unsigned last_bit; bitset_bindex n_bits; n_bits = BITSET_NBITS_ (dst); @@ -923,7 +923,7 @@ ebitset_empty_p (bitset dst) static void ebitset_not (bitset dst, bitset src) { - unsigned int i; + unsigned i; ebitset_elt *selt; ebitset_elt *delt; bitset_windex j; @@ -965,7 +965,7 @@ ebitset_subset_p (bitset dst, bitset src) for (j = 0; j < ssize; j++) { - unsigned int i; + unsigned i; ebitset_elt *selt; ebitset_elt *delt; @@ -1007,7 +1007,7 @@ ebitset_disjoint_p (bitset dst, bitset src) for (j = 0; j < ssize; j++) { - unsigned int i; + unsigned i; ebitset_elt *selt; ebitset_elt *delt; @@ -1040,7 +1040,7 @@ ebitset_op3_cmp (bitset dst, bitset src1, bitset src2, enum bitset_ops op) bitset_word *srcp2; bitset_word *dstp; bool changed = false; - unsigned int i; + unsigned i; bitset_windex j; ebitset_resize (dst, max (BITSET_NBITS_ (src1), BITSET_NBITS_ (src2))); diff --git a/lib/lbitset.c b/lib/lbitset.c index 605b767e..2ad6957d 100644 --- a/lib/lbitset.c +++ b/lib/lbitset.c @@ -54,7 +54,7 @@ typedef bitset_word lbitset_word; /* Number of bits stored in each element. */ #define LBITSET_ELT_BITS \ - ((unsigned int) (LBITSET_ELT_WORDS * LBITSET_WORD_BITS)) + ((unsigned) (LBITSET_ELT_WORDS * LBITSET_WORD_BITS)) /* Lbitset element. We use an array of bits for each element. These are linked together in a doubly-linked list. */ @@ -571,7 +571,7 @@ lbitset_list_reverse (bitset bset, bitset_bindex *list, { bitset_bindex rbitno; bitset_bindex bitno; - unsigned int bcount; + unsigned bcount; bitset_bindex boffset; bitset_windex windex; bitset_bindex count; @@ -883,7 +883,7 @@ lbitset_empty_p (bitset dst) static inline void lbitset_unused_clear (bitset dst) { - unsigned int last_bit; + unsigned last_bit; bitset_bindex n_bits; n_bits = BITSET_SIZE_ (dst); @@ -939,7 +939,7 @@ lbitset_not (bitset dst, bitset src) lbitset_elt *selt; lbitset_elt *delt; bitset_windex i; - unsigned int j; + unsigned j; bitset_windex windex; windex = (BITSET_SIZE_ (dst) + BITSET_WORD_BITS - 1) / BITSET_WORD_BITS; @@ -966,7 +966,7 @@ lbitset_subset_p (bitset dst, bitset src) { lbitset_elt *selt; lbitset_elt *delt; - unsigned int j; + unsigned j; for (selt = LBITSET_HEAD (src), delt = LBITSET_HEAD (dst); selt || delt; selt = selt->next, delt = delt->next) @@ -1003,7 +1003,7 @@ lbitset_disjoint_p (bitset dst, bitset src) { lbitset_elt *selt; lbitset_elt *delt; - unsigned int j; + unsigned j; for (selt = LBITSET_HEAD (src), delt = LBITSET_HEAD (dst); selt && delt; selt = selt->next, delt = delt->next) @@ -1049,7 +1049,7 @@ lbitset_op3_cmp (bitset dst, bitset src1, bitset src2, enum bitset_ops op) bitset_word *srcp2; bitset_word *dstp; bool changed = false; - unsigned int i; + unsigned i; LBITSET_HEAD (dst) = 0; dst->b.csize = 0; @@ -1376,17 +1376,17 @@ void debug_lbitset (bitset bset) { lbitset_elt *elt; - unsigned int i; + unsigned i; if (!bset) return; for (elt = LBITSET_HEAD (bset); elt; elt = elt->next) { - fprintf (stderr, "Elt %lu\n", (unsigned long int) elt->index); + fprintf (stderr, "Elt %lu\n", (unsigned long) elt->index); for (i = 0; i < LBITSET_ELT_WORDS; i++) { - unsigned int j; + unsigned j; bitset_word word; word = elt->words[i]; diff --git a/lib/timevar.c b/lib/timevar.c index e5181821..27c7bf47 100644 --- a/lib/timevar.c +++ b/lib/timevar.c @@ -448,7 +448,7 @@ timevar_print (fp) { /* Only print stuff if we have some sort of time information. */ #if defined HAVE_USER_TIME || defined HAVE_SYS_TIME || defined HAVE_WALL_TIME - unsigned int /* timevar_id_t */ id; + unsigned /* timevar_id_t */ id; struct timevar_time_def *total = &timevars[TV_TOTAL].elapsed; struct timevar_time_def now; @@ -473,7 +473,7 @@ timevar_print (fp) start_time = now; fputs (_("\nExecution times (seconds)\n"), fp); - for (id = 0; id < (unsigned int) TIMEVAR_LAST; ++id) + for (id = 0; id < (unsigned) TIMEVAR_LAST; ++id) { struct timevar_def *tv = &timevars[(timevar_id_t) id]; const float tiny = 5e-3; diff --git a/lib/vbitset.c b/lib/vbitset.c index 8f2bcec1..69d1b762 100644 --- a/lib/vbitset.c +++ b/lib/vbitset.c @@ -170,7 +170,7 @@ vbitset_list_reverse (src, list, num, next) bitset_bindex rbitno; bitset_bindex count; bitset_windex windex; - unsigned int bitcnt; + unsigned bitcnt; bitset_bindex bitoff; bitset_word *srcp = VBITSET_WORDS (src); bitset_bindex n_bits = BITSET_SIZE_ (src); @@ -330,7 +330,7 @@ static inline void vbitset_unused_clear (dst) bitset dst; { - unsigned int last_bit; + unsigned last_bit; last_bit = BITSET_SIZE_ (dst) % BITSET_WORD_BITS; if (last_bit) @@ -343,7 +343,7 @@ static void vbitset_ones (bitset dst) { bitset_word *dstp = VBITSET_WORDS (dst); - unsigned int bytes; + unsigned bytes; bytes = sizeof (bitset_word) * VBITSET_SIZE (dst); @@ -356,7 +356,7 @@ static void vbitset_zero (bitset dst) { bitset_word *dstp = VBITSET_WORDS (dst); - unsigned int bytes; + unsigned bytes; bytes = sizeof (bitset_word) * VBITSET_SIZE (dst); @@ -367,7 +367,7 @@ vbitset_zero (bitset dst) static bool vbitset_empty_p (bitset dst) { - unsigned int i; + unsigned i; bitset_word *dstp = VBITSET_WORDS (dst); for (i = 0; i < VBITSET_SIZE (dst); i++) @@ -406,7 +406,7 @@ vbitset_copy1 (bitset dst, bitset src) static void vbitset_not (bitset dst, bitset src) { - unsigned int i; + unsigned i; bitset_word *srcp; bitset_word *dstp; bitset_windex ssize; @@ -431,7 +431,7 @@ vbitset_not (bitset dst, bitset src) static bool vbitset_equal_p (bitset dst, bitset src) { - unsigned int i; + unsigned i; bitset_word *srcp = VBITSET_WORDS (src); bitset_word *dstp = VBITSET_WORDS (dst); bitset_windex ssize = VBITSET_SIZE (src); @@ -461,7 +461,7 @@ vbitset_equal_p (bitset dst, bitset src) static bool vbitset_subset_p (bitset dst, bitset src) { - unsigned int i; + unsigned i; bitset_word *srcp = VBITSET_WORDS (src); bitset_word *dstp = VBITSET_WORDS (dst); bitset_windex ssize = VBITSET_SIZE (src); @@ -485,7 +485,7 @@ vbitset_subset_p (bitset dst, bitset src) static bool vbitset_disjoint_p (bitset dst, bitset src) { - unsigned int i; + unsigned i; bitset_word *srcp = VBITSET_WORDS (src); bitset_word *dstp = VBITSET_WORDS (dst); bitset_windex ssize = VBITSET_SIZE (src); @@ -502,7 +502,7 @@ vbitset_disjoint_p (bitset dst, bitset src) static void vbitset_and (bitset dst, bitset src1, bitset src2) { - unsigned int i; + unsigned i; bitset_word *src1p; bitset_word *src2p; bitset_word *dstp; @@ -529,7 +529,7 @@ vbitset_and (bitset dst, bitset src1, bitset src2) static bool vbitset_and_cmp (bitset dst, bitset src1, bitset src2) { - unsigned int i; + unsigned i; int changed = 0; bitset_word *src1p; bitset_word *src2p; @@ -582,7 +582,7 @@ vbitset_and_cmp (bitset dst, bitset src1, bitset src2) static void vbitset_andn (bitset dst, bitset src1, bitset src2) { - unsigned int i; + unsigned i; bitset_word *src1p; bitset_word *src2p; bitset_word *dstp; @@ -622,7 +622,7 @@ vbitset_andn (bitset dst, bitset src1, bitset src2) static bool vbitset_andn_cmp (bitset dst, bitset src1, bitset src2) { - unsigned int i; + unsigned i; int changed = 0; bitset_word *src1p; bitset_word *src2p; @@ -687,7 +687,7 @@ vbitset_andn_cmp (bitset dst, bitset src1, bitset src2) static void vbitset_or (bitset dst, bitset src1, bitset src2) { - unsigned int i; + unsigned i; bitset_word *src1p; bitset_word *src2p; bitset_word *dstp; @@ -723,7 +723,7 @@ vbitset_or (bitset dst, bitset src1, bitset src2) static bool vbitset_or_cmp (bitset dst, bitset src1, bitset src2) { - unsigned int i; + unsigned i; int changed = 0; bitset_word *src1p; bitset_word *src2p; @@ -778,7 +778,7 @@ vbitset_or_cmp (bitset dst, bitset src1, bitset src2) static void vbitset_xor (bitset dst, bitset src1, bitset src2) { - unsigned int i; + unsigned i; bitset_word *src1p; bitset_word *src2p; bitset_word *dstp; @@ -814,7 +814,7 @@ vbitset_xor (bitset dst, bitset src1, bitset src2) static bool vbitset_xor_cmp (bitset dst, bitset src1, bitset src2) { - unsigned int i; + unsigned i; int changed = 0; bitset_word *src1p; bitset_word *src2p; @@ -872,7 +872,7 @@ vbitset_xor_cmp (bitset dst, bitset src1, bitset src2) static void vbitset_and_or (bitset dst, bitset src1, bitset src2, bitset src3) { - unsigned int i; + unsigned i; bitset_word *src1p; bitset_word *src2p; bitset_word *src3p; @@ -902,7 +902,7 @@ vbitset_and_or (bitset dst, bitset src1, bitset src2, bitset src3) static bool vbitset_and_or_cmp (bitset dst, bitset src1, bitset src2, bitset src3) { - unsigned int i; + unsigned i; int changed = 0; bitset_word *src1p; bitset_word *src2p; @@ -939,7 +939,7 @@ vbitset_and_or_cmp (bitset dst, bitset src1, bitset src2, bitset src3) static void vbitset_andn_or (bitset dst, bitset src1, bitset src2, bitset src3) { - unsigned int i; + unsigned i; bitset_word *src1p; bitset_word *src2p; bitset_word *src3p; @@ -969,7 +969,7 @@ vbitset_andn_or (bitset dst, bitset src1, bitset src2, bitset src3) static bool vbitset_andn_or_cmp (bitset dst, bitset src1, bitset src2, bitset src3) { - unsigned int i; + unsigned i; int changed = 0; bitset_word *src1p; bitset_word *src2p; @@ -1006,7 +1006,7 @@ vbitset_andn_or_cmp (bitset dst, bitset src1, bitset src2, bitset src3) static void vbitset_or_and (bitset dst, bitset src1, bitset src2, bitset src3) { - unsigned int i; + unsigned i; bitset_word *src1p; bitset_word *src2p; bitset_word *src3p; @@ -1036,7 +1036,7 @@ vbitset_or_and (bitset dst, bitset src1, bitset src2, bitset src3) static bool vbitset_or_and_cmp (bitset dst, bitset src1, bitset src2, bitset src3) { - unsigned int i; + unsigned i; int changed = 0; bitset_word *src1p; bitset_word *src2p;