diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2014-02-14 20:09:01 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2014-02-14 20:09:01 +0000 |
| commit | 076239869a921fff635f11ef9d459eea9a4d8b9f (patch) | |
| tree | 488c4623be96516015caef72c68f393fcb7f4828 /backend/ieee1284.c | |
| parent | 02f3db8a515647960cda4e85bbc5cd52764a0625 (diff) | |
| download | cups-076239869a921fff635f11ef9d459eea9a4d8b9f.tar.gz | |
Fix build errors on Fedora.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11594 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/ieee1284.c')
| -rw-r--r-- | backend/ieee1284.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/backend/ieee1284.c b/backend/ieee1284.c index 48be693f7..b4ded43ee 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -141,8 +141,7 @@ backendGetDeviceID( * Read the 1284 device ID... */ - if ((length = read(devparportfd, device_id, - device_id_size - 1)) >= 2) + if ((length = read(devparportfd, device_id, (size_t)device_id_size - 1)) >= 2) { device_id[length] = '\0'; got_id = 1; @@ -171,8 +170,7 @@ backendGetDeviceID( * bytes. The 1284 spec says the length is stored MSB first... */ - length = (((unsigned)device_id[0] & 255) << 8) + - ((unsigned)device_id[1] & 255); + length = (int)((((unsigned)device_id[0] & 255) << 8) + ((unsigned)device_id[1] & 255)); /* * Check to see if the length is larger than our buffer; first @@ -181,8 +179,7 @@ backendGetDeviceID( */ if (length > device_id_size || length < 14) - length = (((unsigned)device_id[1] & 255) << 8) + - ((unsigned)device_id[0] & 255); + length = (int)((((unsigned)device_id[1] & 255) << 8) + ((unsigned)device_id[0] & 255)); if (length > device_id_size) length = device_id_size; @@ -214,7 +211,7 @@ backendGetDeviceID( length -= 2; - memmove(device_id, device_id + 2, length); + memmove(device_id, device_id + 2, (size_t)length); device_id[length] = '\0'; } } @@ -280,7 +277,7 @@ backendGetDeviceID( */ if (make_model) - backendGetMakeModel(device_id, make_model, make_model_size); + backendGetMakeModel(device_id, make_model, (size_t)make_model_size); /* * Then generate a device URI... |