summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/ata_id/ata_id.c10
-rw-r--r--src/udev/cdrom_id/cdrom_id.c112
-rw-r--r--src/udev/net/ethtool-util.c4
-rw-r--r--src/udev/net/ethtool-util.h2
-rw-r--r--src/udev/scsi_id/scsi.h4
-rw-r--r--src/udev/scsi_id/scsi_serial.c12
-rw-r--r--src/udev/udev-builtin-net_id.c4
-rw-r--r--src/udev/udev-builtin-path_id.c4
-rw-r--r--src/udev/udev-builtin.c8
-rw-r--r--src/udev/udev-ctrl.c2
-rw-r--r--src/udev/udev-event.c6
-rw-r--r--src/udev/udev-rules.c68
-rw-r--r--src/udev/udev.h4
-rw-r--r--src/udev/udevadm-info.c2
14 files changed, 121 insertions, 121 deletions
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
index 9ec472824b..e98425841f 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -257,12 +257,12 @@ static int disk_identify_packet_device_command(
*/
static void disk_identify_get_string(
uint8_t identify[512],
- unsigned int offset_words,
+ unsigned offset_words,
char *dest,
size_t dest_len) {
- unsigned int c1;
- unsigned int c2;
+ unsigned c1;
+ unsigned c2;
while (dest_len > 0) {
c1 = identify[offset_words * 2 + 1];
@@ -278,13 +278,13 @@ static void disk_identify_get_string(
static void disk_identify_fixup_string(
uint8_t identify[512],
- unsigned int offset_words,
+ unsigned offset_words,
size_t len) {
disk_identify_get_string(identify, offset_words,
(char *) identify + offset_words * 2, len);
}
-static void disk_identify_fixup_uint16 (uint8_t identify[512], unsigned int offset_words) {
+static void disk_identify_fixup_uint16 (uint8_t identify[512], unsigned offset_words) {
uint16_t *p;
p = (uint16_t *) identify;
diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c
index d95ee4dd5d..aed24a3b9a 100644
--- a/src/udev/cdrom_id/cdrom_id.c
+++ b/src/udev/cdrom_id/cdrom_id.c
@@ -26,58 +26,58 @@
#include "util.h"
/* device info */
-static unsigned int cd_cd_rom;
-static unsigned int cd_cd_r;
-static unsigned int cd_cd_rw;
-static unsigned int cd_dvd_rom;
-static unsigned int cd_dvd_r;
-static unsigned int cd_dvd_rw;
-static unsigned int cd_dvd_ram;
-static unsigned int cd_dvd_plus_r;
-static unsigned int cd_dvd_plus_rw;
-static unsigned int cd_dvd_plus_r_dl;
-static unsigned int cd_dvd_plus_rw_dl;
-static unsigned int cd_bd;
-static unsigned int cd_bd_r;
-static unsigned int cd_bd_re;
-static unsigned int cd_hddvd;
-static unsigned int cd_hddvd_r;
-static unsigned int cd_hddvd_rw;
-static unsigned int cd_mo;
-static unsigned int cd_mrw;
-static unsigned int cd_mrw_w;
+static unsigned cd_cd_rom;
+static unsigned cd_cd_r;
+static unsigned cd_cd_rw;
+static unsigned cd_dvd_rom;
+static unsigned cd_dvd_r;
+static unsigned cd_dvd_rw;
+static unsigned cd_dvd_ram;
+static unsigned cd_dvd_plus_r;
+static unsigned cd_dvd_plus_rw;
+static unsigned cd_dvd_plus_r_dl;
+static unsigned cd_dvd_plus_rw_dl;
+static unsigned cd_bd;
+static unsigned cd_bd_r;
+static unsigned cd_bd_re;
+static unsigned cd_hddvd;
+static unsigned cd_hddvd_r;
+static unsigned cd_hddvd_rw;
+static unsigned cd_mo;
+static unsigned cd_mrw;
+static unsigned cd_mrw_w;
/* media info */
-static unsigned int cd_media;
-static unsigned int cd_media_cd_rom;
-static unsigned int cd_media_cd_r;
-static unsigned int cd_media_cd_rw;
-static unsigned int cd_media_dvd_rom;
-static unsigned int cd_media_dvd_r;
-static unsigned int cd_media_dvd_rw;
-static unsigned int cd_media_dvd_rw_ro; /* restricted overwrite mode */
-static unsigned int cd_media_dvd_rw_seq; /* sequential mode */
-static unsigned int cd_media_dvd_ram;
-static unsigned int cd_media_dvd_plus_r;
-static unsigned int cd_media_dvd_plus_rw;
-static unsigned int cd_media_dvd_plus_r_dl;
-static unsigned int cd_media_dvd_plus_rw_dl;
-static unsigned int cd_media_bd;
-static unsigned int cd_media_bd_r;
-static unsigned int cd_media_bd_re;
-static unsigned int cd_media_hddvd;
-static unsigned int cd_media_hddvd_r;
-static unsigned int cd_media_hddvd_rw;
-static unsigned int cd_media_mo;
-static unsigned int cd_media_mrw;
-static unsigned int cd_media_mrw_w;
+static unsigned cd_media;
+static unsigned cd_media_cd_rom;
+static unsigned cd_media_cd_r;
+static unsigned cd_media_cd_rw;
+static unsigned cd_media_dvd_rom;
+static unsigned cd_media_dvd_r;
+static unsigned cd_media_dvd_rw;
+static unsigned cd_media_dvd_rw_ro; /* restricted overwrite mode */
+static unsigned cd_media_dvd_rw_seq; /* sequential mode */
+static unsigned cd_media_dvd_ram;
+static unsigned cd_media_dvd_plus_r;
+static unsigned cd_media_dvd_plus_rw;
+static unsigned cd_media_dvd_plus_r_dl;
+static unsigned cd_media_dvd_plus_rw_dl;
+static unsigned cd_media_bd;
+static unsigned cd_media_bd_r;
+static unsigned cd_media_bd_re;
+static unsigned cd_media_hddvd;
+static unsigned cd_media_hddvd_r;
+static unsigned cd_media_hddvd_rw;
+static unsigned cd_media_mo;
+static unsigned cd_media_mrw;
+static unsigned cd_media_mrw_w;
static const char *cd_media_state = NULL;
-static unsigned int cd_media_session_next;
-static unsigned int cd_media_session_count;
-static unsigned int cd_media_track_count;
-static unsigned int cd_media_track_count_data;
-static unsigned int cd_media_track_count_audio;
+static unsigned cd_media_session_next;
+static unsigned cd_media_session_count;
+static unsigned cd_media_track_count;
+static unsigned cd_media_track_count_data;
+static unsigned cd_media_track_count_audio;
static unsigned long long int cd_media_session_last_offset;
#define ERRCODE(s) ((((s)[2] & 0x0F) << 16) | ((s)[12] << 8) | ((s)[13]))
@@ -366,7 +366,7 @@ static void feature_profile_media(int cur_profile) {
}
static int feature_profiles(const unsigned char *profiles, size_t size) {
- unsigned int i;
+ unsigned i;
for (i = 0; i+4 <= size; i += 4) {
int profile;
@@ -498,9 +498,9 @@ static int cd_profiles_old_mmc(int fd) {
static int cd_profiles(int fd) {
struct scsi_cmd sc;
unsigned char features[65530];
- unsigned int cur_profile = 0;
- unsigned int len;
- unsigned int i;
+ unsigned cur_profile = 0;
+ unsigned len;
+ unsigned i;
int err;
int ret;
@@ -564,7 +564,7 @@ static int cd_profiles(int fd) {
/* device features */
for (i = 8; i+4 < len; i += (4 + features[i+3])) {
- unsigned int feature;
+ unsigned feature;
feature = features[i] << 8 | features[i+1];
@@ -738,7 +738,7 @@ static int cd_media_toc(int fd) {
struct scsi_cmd sc;
unsigned char header[12];
unsigned char toc[65536];
- unsigned int len, i, num_tracks;
+ unsigned len, i, num_tracks;
unsigned char *p;
int err;
@@ -782,8 +782,8 @@ static int cd_media_toc(int fd) {
* the TOC, but also avoid going beyond the TOC length, just in case
* the last track number is invalidly large */
for (p = toc+4, i = 4; i < len-8 && num_tracks > 0; i += 8, p += 8, --num_tracks) {
- unsigned int block;
- unsigned int is_data_track;
+ unsigned block;
+ unsigned is_data_track;
is_data_track = (p[1] & 0x04) != 0;
diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c
index d5cf82ed7a..1897f97a04 100644
--- a/src/udev/net/ethtool-util.c
+++ b/src/udev/net/ethtool-util.c
@@ -119,7 +119,7 @@ int ethtool_get_driver(int *fd, const char *ifname, char **ret) {
return 0;
}
-int ethtool_set_speed(int *fd, const char *ifname, unsigned int speed, Duplex duplex) {
+int ethtool_set_speed(int *fd, const char *ifname, unsigned speed, Duplex duplex) {
struct ethtool_cmd ecmd = {
.cmd = ETHTOOL_GSET
};
@@ -474,7 +474,7 @@ static int set_slinksettings(int fd, struct ifreq *ifr, const struct ethtool_lin
struct ethtool_link_settings req;
__u32 link_mode_data[3 * ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32];
} ecmd = {};
- unsigned int offset;
+ unsigned offset;
int r;
if (u->base.cmd != ETHTOOL_GLINKSETTINGS || u->base.link_mode_masks_nwords <= 0)
diff --git a/src/udev/net/ethtool-util.h b/src/udev/net/ethtool-util.h
index 208bf75061..abb0cd0264 100644
--- a/src/udev/net/ethtool-util.h
+++ b/src/udev/net/ethtool-util.h
@@ -101,7 +101,7 @@ typedef struct netdev_channels {
int ethtool_connect(int *ret);
int ethtool_get_driver(int *fd, const char *ifname, char **ret);
-int ethtool_set_speed(int *fd, const char *ifname, unsigned int speed, Duplex duplex);
+int ethtool_set_speed(int *fd, const char *ifname, unsigned speed, Duplex duplex);
int ethtool_set_wol(int *fd, const char *ifname, WakeOnLan wol);
int ethtool_set_features(int *fd, const char *ifname, int *features);
int ethtool_set_glinksettings(int *fd, const char *ifname, struct link_config *link);
diff --git a/src/udev/scsi_id/scsi.h b/src/udev/scsi_id/scsi.h
index 8b759a768d..208b3e72ab 100644
--- a/src/udev/scsi_id/scsi.h
+++ b/src/udev/scsi_id/scsi.h
@@ -16,8 +16,8 @@
#include <scsi/scsi.h>
struct scsi_ioctl_command {
- unsigned int inlen; /* excluding scsi command length */
- unsigned int outlen;
+ unsigned inlen; /* excluding scsi command length */
+ unsigned outlen;
unsigned char data[1];
/* on input, scsi command starts here then opt. data */
};
diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c
index dfdbb5f0aa..c67d047475 100644
--- a/src/udev/scsi_id/scsi_serial.c
+++ b/src/udev/scsi_id/scsi_serial.c
@@ -268,7 +268,7 @@ static int scsi_dump_v4(struct scsi_id_device *dev_scsi, struct sg_io_v4 *io) {
static int scsi_inquiry(struct scsi_id_device *dev_scsi, int fd,
unsigned char evpd, unsigned char page,
- unsigned char *buf, unsigned int buflen) {
+ unsigned char *buf, unsigned buflen) {
unsigned char inq_cmd[INQUIRY_CMDLEN] =
{ INQUIRY_CMD, evpd, page, 0, buflen, 0 };
unsigned char sense[SENSE_BUFF_LEN];
@@ -359,7 +359,7 @@ error:
/* Get list of supported EVPD pages */
static int do_scsi_page0_inquiry(struct scsi_id_device *dev_scsi, int fd,
- unsigned char *buffer, unsigned int len) {
+ unsigned char *buffer, unsigned len) {
int retval;
memzero(buffer, len);
@@ -481,9 +481,9 @@ static int check_fill_0x83_id(struct scsi_id_device *dev_scsi,
}
if (id_search->id_type == SCSI_ID_TGTGROUP && tgpt_group != NULL) {
- unsigned int group;
+ unsigned group;
- group = ((unsigned int)page_83[6] << 8) | page_83[7];
+ group = ((unsigned)page_83[6] << 8) | page_83[7];
sprintf(tgpt_group,"%x", group);
return 1;
}
@@ -557,7 +557,7 @@ static int do_scsi_page83_inquiry(struct scsi_id_device *dev_scsi, int fd,
char *unit_serial_number, char *wwn,
char *wwn_vendor_extension, char *tgpt_group) {
int retval;
- unsigned int id_ind, j;
+ unsigned id_ind, j;
unsigned char page_83[SCSI_INQ_BUFF_LEN];
/* also pick up the page 80 serial number */
@@ -618,7 +618,7 @@ static int do_scsi_page83_inquiry(struct scsi_id_device *dev_scsi, int fd,
* Examine each descriptor returned. There is normally only
* one or a small number of descriptors.
*/
- for (j = 4; j <= (unsigned int)page_83[3] + 3; j += page_83[j + 3] + 4) {
+ for (j = 4; j <= (unsigned)page_83[3] + 3; j += page_83[j + 3] + 4) {
retval = check_fill_0x83_id(dev_scsi, &page_83[j],
&id_search_list[id_ind],
serial, serial_short, len,
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index 6e46a139f3..28d15cc100 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -601,7 +601,7 @@ static int names_usb(struct udev_device *dev, struct netnames *names) {
static int names_bcma(struct udev_device *dev, struct netnames *names) {
struct udev_device *bcmadev;
- unsigned int core;
+ unsigned core;
assert(dev);
assert(names);
@@ -676,7 +676,7 @@ static int names_ccw(struct udev_device *dev, struct netnames *names) {
static int names_mac(struct udev_device *dev, struct netnames *names) {
const char *s;
unsigned long i;
- unsigned int a1, a2, a3, a4, a5, a6;
+ unsigned a1, a2, a3, a4, a5, a6;
/* Some kinds of devices tend to have hardware addresses
* that are impossible to use in an iface name.
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index 693b9820b8..6bbce3c66c 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -452,7 +452,7 @@ static struct udev_device *handle_scsi(struct udev_device *parent, char **path,
static struct udev_device *handle_cciss(struct udev_device *parent, char **path) {
const char *str;
- unsigned int controller, disk;
+ unsigned controller, disk;
str = udev_device_get_sysname(parent);
if (sscanf(str, "c%ud%u%*s", &controller, &disk) != 2)
@@ -497,7 +497,7 @@ static struct udev_device *handle_usb(struct udev_device *parent, char **path) {
static struct udev_device *handle_bcma(struct udev_device *parent, char **path) {
const char *sysname;
- unsigned int core;
+ unsigned core;
sysname = udev_device_get_sysname(parent);
if (sscanf(sysname, "bcma%*u:%u", &core) != 1)
diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 6d204a46b3..da87b2b703 100644
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -31,7 +31,7 @@ static const struct udev_builtin *builtins[] = {
};
void udev_builtin_init(void) {
- unsigned int i;
+ unsigned i;
if (initialized)
return;
@@ -44,7 +44,7 @@ void udev_builtin_init(void) {
}
void udev_builtin_exit(void) {
- unsigned int i;
+ unsigned i;
if (!initialized)
return;
@@ -57,7 +57,7 @@ void udev_builtin_exit(void) {
}
bool udev_builtin_validate(void) {
- unsigned int i;
+ unsigned i;
for (i = 0; i < ELEMENTSOF(builtins); i++)
if (builtins[i] && builtins[i]->validate && builtins[i]->validate())
@@ -66,7 +66,7 @@ bool udev_builtin_validate(void) {
}
void udev_builtin_list(void) {
- unsigned int i;
+ unsigned i;
for (i = 0; i < ELEMENTSOF(builtins); i++)
if (builtins[i])
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index b590a1e4bb..2dd0f2e39d 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -41,7 +41,7 @@ enum udev_ctrl_msg_type {
struct udev_ctrl_msg_wire {
char version[16];
- unsigned int magic;
+ unsigned magic;
enum udev_ctrl_msg_type type;
union {
int intval;
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 75e5866bb0..31d4b6e5c4 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -322,7 +322,7 @@ size_t udev_event_apply_format(struct udev_event *event,
while (from[0] != '\0') {
if (from[0] == '$') {
/* substitute named variable */
- unsigned int i;
+ unsigned i;
if (from[1] == '$') {
from++;
@@ -338,7 +338,7 @@ size_t udev_event_apply_format(struct udev_event *event,
}
} else if (from[0] == '%') {
/* substitute format char */
- unsigned int i;
+ unsigned i;
if (from[1] == '%') {
from++;
@@ -367,7 +367,7 @@ copy:
subst:
/* extract possible $format{attr} */
if (from[0] == '{') {
- unsigned int i;
+ unsigned i;
from++;
for (i = 0; from[i] != '}'; i++)
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index b8088076a4..6ae92e24c6 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -38,7 +38,7 @@
#define PREALLOC_TOKEN 2048
struct uid_gid {
- unsigned int name_off;
+ unsigned name_off;
union {
uid_t uid;
gid_t gid;
@@ -58,26 +58,26 @@ struct udev_rules {
/* every key in the rules file becomes a token */
struct token *tokens;
- unsigned int token_cur;
- unsigned int token_max;
+ unsigned token_cur;
+ unsigned token_max;
/* all key strings are copied and de-duplicated in a single continuous string buffer */
struct strbuf *strbuf;
/* during rule parsing, uid/gid lookup results are cached */
struct uid_gid *uids;
- unsigned int uids_cur;
- unsigned int uids_max;
+ unsigned uids_cur;
+ unsigned uids_max;
struct uid_gid *gids;
- unsigned int gids_cur;
- unsigned int gids_max;
+ unsigned gids_cur;
+ unsigned gids_max;
};
-static char *rules_str(struct udev_rules *rules, unsigned int off) {
+static char *rules_str(struct udev_rules *rules, unsigned off) {
return rules->strbuf->buf + off;
}
-static unsigned int rules_add_string(struct udev_rules *rules, const char *s) {
+static unsigned rules_add_string(struct udev_rules *rules, const char *s) {
return strbuf_add_string(rules->strbuf, s, strlen(s));
}
@@ -182,9 +182,9 @@ struct token {
enum token_type type:8;
bool can_set_name:1;
bool has_static_node:1;
- unsigned int unused:6;
+ unsigned unused:6;
unsigned short token_count;
- unsigned int label_off;
+ unsigned label_off;
unsigned short filename_off;
unsigned short filename_line;
} rule;
@@ -194,10 +194,10 @@ struct token {
enum string_glob_type glob:8;
enum string_subst_type subst:4;
enum string_subst_type attrsubst:4;
- unsigned int value_off;
+ unsigned value_off;
union {
- unsigned int attr_off;
- unsigned int rule_goto;
+ unsigned attr_off;
+ unsigned rule_goto;
mode_t mode;
uid_t uid;
gid_t gid;
@@ -214,7 +214,7 @@ struct rule_tmp {
struct udev_rules *rules;
struct token rule;
struct token token[MAX_TK];
- unsigned int token_cur;
+ unsigned token_cur;
};
#ifdef DEBUG
@@ -325,7 +325,7 @@ static void dump_token(struct udev_rules *rules, struct token *token) {
{
const char *tks_ptr = (char *)rules->tokens;
const char *tk_ptr = (char *)token;
- unsigned int idx = (tk_ptr - tks_ptr) / sizeof(struct token);
+ unsigned idx = (tk_ptr - tks_ptr) / sizeof(struct token);
log_debug("* RULE %s:%u, token: %u, count: %u, label: '%s'",
&rules->strbuf->buf[token->rule.filename_off], token->rule.filename_line,
@@ -425,7 +425,7 @@ static void dump_token(struct udev_rules *rules, struct token *token) {
}
static void dump_rules(struct udev_rules *rules) {
- unsigned int i;
+ unsigned i;
log_debug("dumping %u (%zu bytes) tokens, %zu (%zu bytes) strings",
rules->token_cur,
@@ -444,7 +444,7 @@ static int add_token(struct udev_rules *rules, struct token *token) {
/* grow buffer if needed */
if (rules->token_cur+1 >= rules->token_max) {
struct token *tokens;
- unsigned int add;
+ unsigned add;
/* double the buffer size */
add = rules->token_max;
@@ -470,9 +470,9 @@ static void log_unknown_owner(int error, const char *entity, const char *owner)
}
static uid_t add_uid(struct udev_rules *rules, const char *owner) {
- unsigned int i;
+ unsigned i;
uid_t uid = 0;
- unsigned int off;
+ unsigned off;
int r;
/* lookup, if we know it already */
@@ -490,7 +490,7 @@ static uid_t add_uid(struct udev_rules *rules, const char *owner) {
/* grow buffer if needed */
if (rules->uids_cur+1 >= rules->uids_max) {
struct uid_gid *uids;
- unsigned int add;
+ unsigned add;
/* double the buffer size */
add = rules->uids_max;
@@ -513,9 +513,9 @@ static uid_t add_uid(struct udev_rules *rules, const char *owner) {
}
static gid_t add_gid(struct udev_rules *rules, const char *group) {
- unsigned int i;
+ unsigned i;
gid_t gid = 0;
- unsigned int off;
+ unsigned off;
int r;
/* lookup, if we know it already */
@@ -533,7 +533,7 @@ static gid_t add_gid(struct udev_rules *rules, const char *group) {
/* grow buffer if needed */
if (rules->gids_cur+1 >= rules->gids_max) {
struct uid_gid *gids;
- unsigned int add;
+ unsigned add;
/* double the buffer size */
add = rules->gids_max;
@@ -973,14 +973,14 @@ static void rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
}
static int sort_token(struct udev_rules *rules, struct rule_tmp *rule_tmp) {
- unsigned int i;
- unsigned int start = 0;
- unsigned int end = rule_tmp->token_cur;
+ unsigned i;
+ unsigned start = 0;
+ unsigned end = rule_tmp->token_cur;
for (i = 0; i < rule_tmp->token_cur; i++) {
enum token_type next_val = TK_UNSET;
- unsigned int next_idx = 0;
- unsigned int j;
+ unsigned next_idx = 0;
+ unsigned j;
/* find smallest value */
for (j = start; j < end; j++) {
@@ -1012,7 +1012,7 @@ static int sort_token(struct udev_rules *rules, struct rule_tmp *rule_tmp) {
#define LOG_AND_RETURN(fmt, ...) { LOG_RULE_ERROR(fmt, __VA_ARGS__); return; }
static void add_rule(struct udev_rules *rules, char *line,
- const char *filename, unsigned int filename_off, unsigned int lineno) {
+ const char *filename, unsigned filename_off, unsigned lineno) {
char *linepos;
const char *attr;
struct rule_tmp rule_tmp = {
@@ -1433,11 +1433,11 @@ static void add_rule(struct udev_rules *rules, char *line,
static int parse_file(struct udev_rules *rules, const char *filename) {
_cleanup_fclose_ FILE *f = NULL;
- unsigned int first_token;
- unsigned int filename_off;
+ unsigned first_token;
+ unsigned filename_off;
char line[UTIL_LINE_SIZE];
int line_nr = 0;
- unsigned int i;
+ unsigned i;
f = fopen(filename, "re");
if (!f) {
@@ -1495,7 +1495,7 @@ static int parse_file(struct udev_rules *rules, const char *filename) {
for (i = first_token+1; i < rules->token_cur; i++) {
if (rules->tokens[i].type == TK_A_GOTO) {
char *label = rules_str(rules, rules->tokens[i].key.value_off);
- unsigned int j;
+ unsigned j;
for (j = i+1; j < rules->token_cur; j++) {
if (rules->tokens[j].type != TK_RULE)
diff --git a/src/udev/udev.h b/src/udev/udev.h
index 99217545dc..c9250edd9a 100644
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -34,8 +34,8 @@ struct udev_event {
int exec_delay;
usec_t birth_usec;
sd_netlink *rtnl;
- unsigned int builtin_run;
- unsigned int builtin_ret;
+ unsigned builtin_run;
+ unsigned builtin_ret;
bool inotify_watch;
bool inotify_watch_final;
bool group_set;
diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index b2127db0b1..6c16b6f6b9 100644
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -32,7 +32,7 @@ static bool skip_attribute(const char *name) {
"subsystem",
"module",
};
- unsigned int i;
+ unsigned i;
for (i = 0; i < ELEMENTSOF(skip); i++)
if (streq(name, skip[i]))
View Lorry Controller Status