Skip to content

Commit fc863de

Browse files
kaysieverskaysievers
committed
udev: fix gcc warnings
1 parent 3e21478 commit fc863de

File tree

7 files changed

+25
-21
lines changed

7 files changed

+25
-21
lines changed

‎src/udev/cdrom_id/cdrom_id.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static bool is_mounted(const char *device)
138138
return mounted;
139139
}
140140

141-
static void info_scsi_cmd_err(struct udev *udev, char *cmd, int err)
141+
static void info_scsi_cmd_err(struct udev *udev, const char *cmd, int err)
142142
{
143143
if (err == -1) {
144144
info(udev, "%s failed\n", cmd);

‎src/udev/keymap/keymap.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,9 @@ int main(int argc, char **argv)
418418
/* Keymap file argument is a filename */
419419
/* Open override file if present, otherwise default file */
420420
char keymap_path[PATH_MAX];
421+
FILE *f;
421422
snprintf(keymap_path, sizeof(keymap_path), "%s%s", SYSCONFDIR "/udev/keymaps/", filearg);
422-
FILE *f = fopen(keymap_path, "r");
423+
f = fopen(keymap_path, "r");
423424
if (f) {
424425
merge_table(fd, f);
425426
} else {

‎src/udev/libudev-queue.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ ssize_t udev_queue_skip_devpath(FILE *queue_file)
171171
unsigned short int len;
172172

173173
if (fread(&len, sizeof(unsigned short int), 1, queue_file) == 1) {
174-
char devpath[len];
174+
char *devpath = alloca(len);
175175

176176
/* use fread to skip, fseek might drop buffered data */
177177
if (fread(devpath, 1, len, queue_file) == len)
@@ -197,7 +197,7 @@ ssize_t udev_queue_read_devpath(FILE *queue_file, char *devpath, size_t size)
197197
/* if devpath was too long, skip unread characters */
198198
if (read_bytes != len) {
199199
unsigned short int skip_bytes = len - read_bytes;
200-
char buf[skip_bytes];
200+
char *buf = alloca(skip_bytes);
201201

202202
if (fread(buf, 1, skip_bytes, queue_file) != skip_bytes)
203203
return -1;

‎src/udev/libudev-util-private.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ int util_delete_path(struct udev *udev, const char *path)
116116
uid_t util_lookup_user(struct udev *udev, const char *user)
117117
{
118118
char *endptr;
119-
size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
120-
char buf[buflen];
121119
struct passwd pwbuf;
122120
struct passwd *pw;
123121
uid_t uid;
122+
size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
123+
char *buf = alloca(buflen);
124124

125125
if (strcmp(user, "root") == 0)
126126
return 0;
@@ -141,11 +141,11 @@ uid_t util_lookup_user(struct udev *udev, const char *user)
141141
gid_t util_lookup_group(struct udev *udev, const char *group)
142142
{
143143
char *endptr;
144-
size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
145-
char *buf;
146144
struct group grbuf;
147145
struct group *gr;
148146
gid_t gid = 0;
147+
size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
148+
char *buf = alloca(buflen);
149149

150150
if (strcmp(group, "root") == 0)
151151
return 0;

‎src/udev/mtd_probe/mtd_probe.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,22 @@
2828

2929
int main(int argc, char** argv)
3030
{
31+
int mtd_fd;
32+
int error;
33+
mtd_info_t mtd_info;
34+
3135
if (argc != 2) {
3236
printf("usage: mtd_probe /dev/mtd[n]\n");
3337
return 1;
3438
}
3539

36-
int mtd_fd = open(argv[1], O_RDONLY);
40+
mtd_fd = open(argv[1], O_RDONLY);
3741
if (mtd_fd == -1) {
3842
perror("open");
3943
exit(-1);
4044
}
4145

42-
mtd_info_t mtd_info;
43-
int error = ioctl(mtd_fd, MEMGETINFO, &mtd_info);
46+
error = ioctl(mtd_fd, MEMGETINFO, &mtd_info);
4447
if (error == -1) {
4548
perror("ioctl");
4649
exit(-1);

‎src/udev/mtd_probe/probe_smartmedia.c‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,23 @@ static const uint8_t cis_signature[] = {
3636

3737
void probe_smart_media(int mtd_fd, mtd_info_t* info)
3838
{
39+
int sector_size;
40+
int block_size;
41+
int size_in_megs;
42+
int spare_count;
3943
char* cis_buffer = malloc(SM_SECTOR_SIZE);
44+
int offset;
45+
int cis_found = 0;
4046

4147
if (!cis_buffer)
4248
return;
4349

4450
if (info->type != MTD_NANDFLASH)
4551
goto exit;
4652

47-
int sector_size = info->writesize;
48-
int block_size = info->erasesize;
49-
int size_in_megs = info->size / (1024 * 1024);
50-
int spare_count;
51-
53+
sector_size = info->writesize;
54+
block_size = info->erasesize;
55+
size_in_megs = info->size / (1024 * 1024);
5256

5357
if (sector_size != SM_SECTOR_SIZE && sector_size != SM_SMALL_PAGE)
5458
goto exit;
@@ -66,13 +70,8 @@ void probe_smart_media(int mtd_fd, mtd_info_t* info)
6670
break;
6771
}
6872

69-
70-
int offset;
71-
int cis_found = 0;
72-
7373
for (offset = 0 ; offset < block_size * spare_count ;
7474
offset += sector_size) {
75-
7675
lseek(mtd_fd, SEEK_SET, offset);
7776
if (read(mtd_fd, cis_buffer, SM_SECTOR_SIZE) == SM_SECTOR_SIZE){
7877
cis_found = 1;

‎src/udev/udev.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ const char *udev_builtin_name(enum udev_builtin_cmd cmd);
164164
bool udev_builtin_run_once(enum udev_builtin_cmd cmd);
165165
int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test);
166166
void udev_builtin_list(struct udev *udev);
167+
bool udev_builtin_validate(struct udev *udev);
167168
int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val);
168169

169170
/* udev logging */

0 commit comments

Comments
 (0)