diff options
author | Radoslaw Pajak <r.pajak@samsung.com> | 2013-12-13 11:16:04 +0100 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-02-11 11:55:29 +0100 |
commit | 8e94b667f461736be53f14865e78be21f78d62d8 (patch) | |
tree | 937beb390f2ae09671e2368977d33bd064d04c32 | |
parent | 4ac5b85fb3d69ca781bf4a4f98e072f2c5602550 (diff) |
[daemon-fix] fixed querying about name information
Change-Id: Ife6538b1f72d601da93bff83d361c6d10a02bc0e
Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com>
-rw-r--r-- | bus/kdbus-d.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bus/kdbus-d.c b/bus/kdbus-d.c index f93fa9b9..5e783fd6 100644 --- a/bus/kdbus-d.c +++ b/bus/kdbus-d.c @@ -240,7 +240,7 @@ int kdbus_NameQuery(const char* name, DBusTransport* transport, struct nameInfo* if(id == 0) size += strlen(name) + 1; - cmd = malloc(size); + cmd = alloca(size); if (!cmd) { _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno)); @@ -259,6 +259,7 @@ int kdbus_NameQuery(const char* name, DBusTransport* transport, struct nameInfo* if(errno == EINTR) goto again; pInfo->uniqueId = 0; + return -errno; } else { @@ -299,11 +300,10 @@ int kdbus_NameQuery(const char* name, DBusTransport* transport, struct nameInfo* if(errno == EINTR) goto again2; _dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno); - return -1; + return -errno; } } - free(cmd); return ret; } @@ -795,7 +795,7 @@ int kdbus_get_name_owner(DBusConnection* connection, const char* name, char* own _dbus_verbose("Unique name discovered:%s\n", owner); } else if((ret != -ENOENT) && (ret != -ENXIO)) - _dbus_verbose("kdbus error sending name query: err %d (%m)\n", errno); + _dbus_verbose("kdbus error sending name query: err %d (%m)\n", ret); return ret; } |