else
{
dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID,
- "Key '%s' in match rule contains junk after argument number (%u). Only 'arg%upath' (for example) or 'arg0namespace' are valid", key, arg, arg);
+ "Key '%s' in match rule contains junk after argument number (%lu). Only 'arg%lupath' (for example) or 'arg0namespace' are valid", key, arg, arg);
goto failed;
}
}
rule->args[arg] != NULL)
{
dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID,
- "Argument %d matched more than once in match rule\n", key);
+ "Argument %s matched more than once in match rule\n", key);
goto failed;
}
ret_size = header_size + body_size;
/* check whether we can and should use memfd */
- if ((dst_id != KDBUS_DST_ID_BROADCAST) && (ret_size > MEMFD_SIZE_THRESHOLD))
+ if ((dst_id != KDBUS_DST_ID_BROADCAST) && ((uint64_t)ret_size > MEMFD_SIZE_THRESHOLD))
memfd = kdbus_acquire_memfd ();
_dbus_message_get_unix_fds (message, &unix_fds, &fds_count);
{
DBusString str;
int size, ret, *fds;
- unsigned n_fds;
+ int n_fds;
char *data;
/* check message size */
_dbus_string_init_const_len (&str, data, ret);
/* create DBusMessage from kmsg */
- *sync_reply = _dbus_decode_kmsg (&str, msg_reply->src_id, fds, n_fds);
+ *sync_reply = _dbus_decode_kmsg (&str, msg_reply->src_id, fds, (unsigned int)n_fds);
if (*sync_reply == NULL)
ret_size = -1;
if (!dbus_watch_get_enabled (kdbus_transport->read_watch))
return TRUE;
- if (!_dbus_message_loader_get_unix_fds (transport->loader, &fds, &n_fds))
+ if (!_dbus_message_loader_get_unix_fds (transport->loader, &fds, (unsigned int *)&n_fds))
{
_dbus_verbose ("Out of memory reading file descriptors\n");
oom = TRUE;