summaryrefslogtreecommitdiff
path: root/extras/usb_id
diff options
context:
space:
mode:
Diffstat (limited to 'extras/usb_id')
-rw-r--r--extras/usb_id/Makefile2
-rw-r--r--extras/usb_id/usb_id.c5
2 files changed, 2 insertions, 5 deletions
diff --git a/extras/usb_id/Makefile b/extras/usb_id/Makefile
index e319a4fee8..0635e91cc5 100644
--- a/extras/usb_id/Makefile
+++ b/extras/usb_id/Makefile
@@ -28,8 +28,6 @@ INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
-CFLAGS+=-D_FILE_OFFSET_BITS=64
-
OBJS = $(PROG).o $(VOLUME_ID_OBJS) ../../udev.a ../../libsysfs/sysfs.a
HEADERS =
diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index 720a0f5df7..37db6d14db 100644
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -76,10 +76,9 @@ static int use_num_info;
static int export;
static int debug;
-static void set_str(char *to, const unsigned char *from, int count)
+static void set_str(char *to, const char *from, size_t count)
{
- int i, j;
- int len;
+ size_t i, j, len;
/* strip trailing whitespace */
len = strnlen(from, count);