mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
reset dbus error struct before retrying parsing messages
This commit is contained in:
parent
e7b9da3209
commit
888256b0be
1 changed files with 6 additions and 0 deletions
|
|
@ -94,6 +94,8 @@ static void add_session(struct userdata *u, const char *id) {
|
||||||
|
|
||||||
/* CK 0.3 this changed from int32 to uint32 */
|
/* CK 0.3 this changed from int32 to uint32 */
|
||||||
if (!dbus_message_get_args(reply, &error, DBUS_TYPE_UINT32, &uid, DBUS_TYPE_INVALID)) {
|
if (!dbus_message_get_args(reply, &error, DBUS_TYPE_UINT32, &uid, DBUS_TYPE_INVALID)) {
|
||||||
|
dbus_error_free(&error);
|
||||||
|
|
||||||
if (!dbus_message_get_args(reply, &error, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID)) {
|
if (!dbus_message_get_args(reply, &error, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID)) {
|
||||||
pa_log("Failed to parse GetUnixUser() result: %s: %s", error.name, error.message);
|
pa_log("Failed to parse GetUnixUser() result: %s: %s", error.name, error.message);
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
@ -167,6 +169,8 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
|
||||||
|
|
||||||
/* CK API changed to match spec in 0.3 */
|
/* CK API changed to match spec in 0.3 */
|
||||||
if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) {
|
if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) {
|
||||||
|
dbus_error_free(&error);
|
||||||
|
|
||||||
if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) {
|
if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) {
|
||||||
pa_log_error("Failed to parse SessionAdded message: %s: %s", error.name, error.message);
|
pa_log_error("Failed to parse SessionAdded message: %s: %s", error.name, error.message);
|
||||||
goto finish;
|
goto finish;
|
||||||
|
|
@ -179,6 +183,8 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
|
||||||
|
|
||||||
/* CK API changed to match spec in 0.3 */
|
/* CK API changed to match spec in 0.3 */
|
||||||
if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) {
|
if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) {
|
||||||
|
dbus_error_free(&error);
|
||||||
|
|
||||||
if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) {
|
if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) {
|
||||||
pa_log_error("Failed to parse SessionRemoved message: %s: %s", error.name, error.message);
|
pa_log_error("Failed to parse SessionRemoved message: %s: %s", error.name, error.message);
|
||||||
goto finish;
|
goto finish;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue