From 770d4ad14f0d54628b857b4bde8ac82d92c4509d Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Thu, 7 Sep 2023 21:36:20 +0200 Subject: [PATCH] QDBusConnection: Print error from prepareHook When the operation fails we print a warning, but that warning does not include the error message that prepareHook internally collects but ignores. Printing the error is useful for debugging. Change-Id: I946c4781942115a17ffd43a79bff7676b6674be1 Reviewed-by: Thiago Macieira (cherry picked from commit b2e5f7049047f6311b96506621ac75ec2fcb0c2e) --- src/dbus/qdbusconnection_p.h | 9 ++++----- src/dbus/qdbusintegrator.cpp | 36 +++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index dc16da0a7e0..5268b2259ba 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -321,11 +321,10 @@ public: static int findSlot(QObject *obj, const QByteArray &normalizedName, QList ¶ms, QString &errorMsg); static bool prepareHook(QDBusConnectionPrivate::SignalHook &hook, QString &key, - const QString &service, - const QString &path, const QString &interface, const QString &name, - const ArgMatchRules &argMatch, - QObject *receiver, const char *signal, int minMIdx, - bool buildSignature); + const QString &service, const QString &path, const QString &interface, + const QString &name, const ArgMatchRules &argMatch, QObject *receiver, + const char *signal, int minMIdx, bool buildSignature, + QString &errorMsg); static DBusHandlerResult messageFilter(DBusConnection *, DBusMessage *, void *); static QDBusCallDeliveryEvent *prepareReply(QDBusConnectionPrivate *target, QObject *object, int idx, const QList &metaTypes, diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index ec34d638b63..20496290fe2 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -1287,14 +1287,13 @@ int QDBusConnectionPrivate::findSlot(QObject *obj, const QByteArray &normalizedN } bool QDBusConnectionPrivate::prepareHook(QDBusConnectionPrivate::SignalHook &hook, QString &key, - const QString &service, - const QString &path, const QString &interface, const QString &name, - const ArgMatchRules &argMatch, - QObject *receiver, const char *signal, int minMIdx, - bool buildSignature) + const QString &service, const QString &path, + const QString &interface, const QString &name, + const ArgMatchRules &argMatch, QObject *receiver, + const char *signal, int minMIdx, bool buildSignature, + QString &errorMsg) { QByteArray normalizedName = signal + 1; - QString errorMsg; hook.midx = findSlot(receiver, signal + 1, hook.params, errorMsg); if (hook.midx == -1) { normalizedName = QMetaObject::normalizedSignature(signal + 1); @@ -2210,9 +2209,11 @@ bool QDBusConnectionPrivate::connectSignal(const QString &service, QString key; hook.signature = signature; + QString errorMsg; if (!prepareHook(hook, key, service, path, interface, name, argumentMatch, receiver, slot, 0, - false)) { - qCWarning(dbusIntegration) << "Could not connect" << interface << "to" << slot + 1; + false, errorMsg)) { + qCWarning(dbusIntegration) + << "Could not connect" << interface << "to" << slot + 1 << ":" << qPrintable(errorMsg); return false; // don't connect } @@ -2303,9 +2304,11 @@ bool QDBusConnectionPrivate::disconnectSignal(const QString &service, name2.detach(); hook.signature = signature; + QString errorMsg; if (!prepareHook(hook, key, service, path, interface, name, argumentMatch, receiver, slot, 0, - false)) { - qCWarning(dbusIntegration) << "Could not disconnect" << interface << "to" << slot + 1; + false, errorMsg)) { + qCWarning(dbusIntegration) + << "Could not disconnect" << interface << "to" << slot + 1 << ":" << qPrintable(errorMsg); return false; // don't disconnect } @@ -2435,9 +2438,11 @@ void QDBusConnectionPrivate::connectRelay(const QString &service, QByteArray sig; sig.append(QSIGNAL_CODE + '0'); sig.append(signal.methodSignature()); + QString errorMsg; if (!prepareHook(hook, key, service, path, interface, QString(), ArgMatchRules(), receiver, sig, - QDBusAbstractInterface::staticMetaObject.methodCount(), true)) { - qCWarning(dbusIntegration) << "Could not connect" << interface << "to" << signal.name(); + QDBusAbstractInterface::staticMetaObject.methodCount(), true, errorMsg)) { + qCWarning(dbusIntegration) + << "Could not connect" << interface << "to" << signal.name() << ":" << qPrintable(errorMsg); return; // don't connect } @@ -2458,10 +2463,11 @@ void QDBusConnectionPrivate::disconnectRelay(const QString &service, QByteArray sig; sig.append(QSIGNAL_CODE + '0'); sig.append(signal.methodSignature()); + QString errorMsg; if (!prepareHook(hook, key, service, path, interface, QString(), ArgMatchRules(), receiver, sig, - QDBusAbstractInterface::staticMetaObject.methodCount(), true)) { - qCWarning(dbusIntegration) - << "Could not disconnect" << interface << "to" << signal.methodSignature(); + QDBusAbstractInterface::staticMetaObject.methodCount(), true, errorMsg)) { + qCWarning(dbusIntegration) << "Could not disconnect" << interface << "to" + << signal.methodSignature() << ":" << qPrintable(errorMsg); return; // don't disconnect }