Skip to content

Fix-up ORs #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelrsweet merged 1 commit into from
Jan 30, 2023
Merged

Fix-up ORs #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/ieee1284.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ backendGetDeviceID(
* bytes. The 1284 spec says the length is stored MSB first...
*/

length = (int)((((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
Expand All @@ -166,7 +166,7 @@ backendGetDeviceID(
*/

if (length > device_id_size || length < 14)
length = (int)((((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;
Expand Down
2 changes: 1 addition & 1 deletion cups/dest-options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1621,7 +1621,7 @@ cups_collection_string(
const ipp_uchar_t *date = ippGetDate(member, j);
/* Date value */

year = ((unsigned)date[0] << 8) + (unsigned)date[1];
year = (date[0] << 8) | date[1];

if (date[9] == 0 && date[10] == 0)
snprintf(temp, sizeof(temp), "%04u-%02u-%02uT%02u:%02u:%02uZ", year, date[2], date[3], date[4], date[5], date[6]);
Expand Down
3 changes: 1 addition & 2 deletions scheduler/conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1975,8 +1975,7 @@ get_addr_and_mask(const char *value, /* I - String from config file */
mask + 3) != 4)
return (0);

mask[3] |= ((unsigned)mask[0] << 24) | ((unsigned)mask[1] << 16) |
((unsigned)mask[2] << 8);
mask[3] |= (mask[0] << 24) | (mask[1] << 16) | (mask[2] << 8);
mask[0] = mask[1] = mask[2] = 0;
}
else
Expand Down