diff options
| author | Kay Sievers <kay.sievers@suse.de> | 2005-08-01 01:33:36 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@suse.de> | 2005-08-01 01:33:36 +0200 |
| commit | 70721db6d7ba0d4f3ac5c17f2cedac056065ad8a (patch) | |
| tree | f029523e975639453dcd027ee43a7bc742d0845c /extras/usb_id | |
| parent | 62a22c8d75550d5720019468c7a881a573bff22b (diff) | |
fix GGC signed pointer warnings and switch volume_id to stdint
Solaris uses volume_id now and they fiddled around with configure scripts
to map the linux kernel int types. Adding the types locally to volume_id
breaks the klibc build, so just switch to these ugly types and forget it. :)
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
Diffstat (limited to 'extras/usb_id')
| -rw-r--r-- | extras/usb_id/Makefile | 2 | ||||
| -rw-r--r-- | extras/usb_id/usb_id.c | 5 |
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); |