diff options
| author | Michael Sweet <msweet@msweet-imac.local> | 2016-03-15 10:40:21 -0400 |
|---|---|---|
| committer | Michael Sweet <msweet@msweet-imac.local> | 2016-03-15 10:40:21 -0400 |
| commit | 1a18c85cd15c6af88ec2c3a5ece0d67add6f56a7 (patch) | |
| tree | 4968073dde318aa6b65647ddc403a9dbc1e8836b /notifier/dbus.c | |
| parent | b60086f8ae7ff126ecb97cf6d400d6d4a5c6f571 (diff) | |
| download | cups-1a18c85cd15c6af88ec2c3a5ece0d67add6f56a7.tar.gz | |
Import CUPS v2.0b1release-2.0b1
Diffstat (limited to 'notifier/dbus.c')
| -rw-r--r-- | notifier/dbus.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/notifier/dbus.c b/notifier/dbus.c index fc63aac4b..2a01f2479 100644 --- a/notifier/dbus.c +++ b/notifier/dbus.c @@ -1,5 +1,5 @@ /* - * "$Id: dbus.c 11500 2014-01-06 22:21:15Z msweet $" + * "$Id: dbus.c 11594 2014-02-14 20:09:01Z msweet $" * * D-Bus notifier for CUPS. * @@ -417,7 +417,7 @@ main(int argc, /* I - Number of command-line args */ attr = ippFindAttribute(msg, "printer-state", IPP_TAG_ENUM); if (attr) { - dbus_uint32_t val = ippGetInteger(attr, 0); + dbus_uint32_t val = (dbus_uint32_t)ippGetInteger(attr, 0); dbus_message_iter_append_uint32(&iter, &val); } else @@ -446,8 +446,7 @@ main(int argc, /* I - Number of command-line args */ if (i) *p++ = ','; - strlcpy(p, ippGetString(attr, i, NULL), - reasons_length - (p - printer_reasons)); + strlcpy(p, ippGetString(attr, i, NULL), reasons_length - (size_t)(p - printer_reasons)); p += strlen(p); } if (!dbus_message_iter_append_string(&iter, &printer_reasons)) @@ -466,7 +465,7 @@ main(int argc, /* I - Number of command-line args */ IPP_TAG_BOOLEAN); if (attr) { - dbus_bool_t val = ippGetBoolean(attr, 0); + dbus_bool_t val = (dbus_bool_t)ippGetBoolean(attr, 0); dbus_message_iter_append_boolean(&iter, &val); } else @@ -486,7 +485,7 @@ main(int argc, /* I - Number of command-line args */ attr = ippFindAttribute(msg, "notify-job-id", IPP_TAG_INTEGER); if (attr) { - dbus_uint32_t val = ippGetInteger(attr, 0); + dbus_uint32_t val = (dbus_uint32_t)ippGetInteger(attr, 0); dbus_message_iter_append_uint32(&iter, &val); } else @@ -496,7 +495,7 @@ main(int argc, /* I - Number of command-line args */ attr = ippFindAttribute(msg, "job-state", IPP_TAG_ENUM); if (attr) { - dbus_uint32_t val = ippGetInteger(attr, 0); + dbus_uint32_t val = (dbus_uint32_t)ippGetInteger(attr, 0); dbus_message_iter_append_uint32(&iter, &val); } else @@ -519,8 +518,7 @@ main(int argc, /* I - Number of command-line args */ if (i) *p++ = ','; - strlcpy(p, ippGetString(attr, i, NULL), - reasons_length - (p - job_reasons)); + strlcpy(p, ippGetString(attr, i, NULL), reasons_length - (size_t)(p - job_reasons)); p += strlen(p); } if (!dbus_message_iter_append_string(&iter, &job_reasons)) @@ -545,7 +543,7 @@ main(int argc, /* I - Number of command-line args */ IPP_TAG_INTEGER); if (attr) { - dbus_uint32_t val = ippGetInteger(attr, 0); + dbus_uint32_t val = (dbus_uint32_t)ippGetInteger(attr, 0); dbus_message_iter_append_uint32(&iter, &val); } else @@ -656,5 +654,5 @@ main(void) /* - * End of "$Id: dbus.c 11500 2014-01-06 22:21:15Z msweet $". + * End of "$Id: dbus.c 11594 2014-02-14 20:09:01Z msweet $". */ |