chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: builtin - rename net_link to net_setup_link
[elogind.git]
/
src
/
udev
/
udev-builtin-usb_id.c
diff --git
a/src/udev/udev-builtin-usb_id.c
b/src/udev/udev-builtin-usb_id.c
index 269aa4e1aa5383ade38689542a45dfb5da3790c9..3e2f43e1a6dd0144537f95c11fa3a46ec2ad6954 100644
(file)
--- a/
src/udev/udev-builtin-usb_id.c
+++ b/
src/udev/udev-builtin-usb_id.c
@@
-91,6
+91,9
@@
static int set_usb_mass_storage_ifsubtype(char *to, const char *from, size_t len
type_num = strtoul(from, &eptr, 0);
if (eptr != from) {
switch (type_num) {
type_num = strtoul(from, &eptr, 0);
if (eptr != from) {
switch (type_num) {
+ case 1: /* RBC devices */
+ type = "rbc";
+ break;
case 2:
type = "atapi";
break;
case 2:
type = "atapi";
break;
@@
-98,12
+101,8
@@
static int set_usb_mass_storage_ifsubtype(char *to, const char *from, size_t len
type = "tape";
break;
case 4: /* UFI */
type = "tape";
break;
case 4: /* UFI */
- case 5: /* SFF-8070i */
type = "floppy";
break;
type = "floppy";
break;
- case 1: /* RBC devices */
- type = "rbc";
- break;
case 6: /* Transparent SPC-2 devices */
type = "scsi";
break;
case 6: /* Transparent SPC-2 devices */
type = "scsi";
break;
@@
-151,8
+150,8
@@
static void set_scsi_type(char *to, const char *from, size_t len)
static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len)
{
static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len)
{
-
char _cleanup_free_
*filename = NULL;
-
int _cleanup_close_
fd = -1;
+
_cleanup_free_ char
*filename = NULL;
+
_cleanup_close_ int
fd = -1;
ssize_t size;
unsigned char buf[18 + 65535];
int pos = 0;
ssize_t size;
unsigned char buf[18 + 65535];
int pos = 0;