2010-10-25 16:28:43

by Elvis Pfutzenreuter

Subject: [PATCH 1/2] Fix fd comparison

---
health/hdp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/health/hdp.c b/health/hdp.c
index fd3b1ca..eb27613 100644
--- a/health/hdp.c
+++ b/health/hdp.c
@@ -477,7 +477,7 @@ static void hdp_mdl_reconn_cb(struct mcap_mdl *mdl, GError *err, gpointer data)
}

fd = mcap_mdl_get_fd(dc_data->hdp_chann->mdl);
- if (fd <= 0)
+ if (fd < 0)
reply = g_dbus_create_error(dc_data->msg,
ERROR_INTERFACE ".HealthError",
"Cannot get file descriptor");
@@ -568,7 +568,7 @@ static DBusMessage *channel_acquire_continue(struct hdp_tmp_dc_data *data,
}

fd = mcap_mdl_get_fd(data->hdp_chann->mdl);
- if (fd > 0)
+ if (fd >= 0)
return g_dbus_create_reply(data->msg, DBUS_TYPE_UNIX_FD, &fd,
DBUS_TYPE_INVALID);

--
1.7.0.4

2010-10-25 18:50:25

by Johan Hedberg

Subject: Re: [PATCH 2/2] Fix coding style and comment

Hi Elvis,

On Mon, Oct 25, 2010, Elvis Pf?tzenreuter wrote:
> ---
> health/hdp.c | 2 +-
> health/mcap_sync.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)

This one has also been pushed upstream. Thanks.

Johan

2010-10-25 18:49:00

by Johan Hedberg

Subject: Re: [PATCH 1/2] Fix fd comparison

Hi Elvis,

On Mon, Oct 25, 2010, Elvis Pf?tzenreuter wrote:
> ---
> health/hdp.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)

Pushed upstream. Thanks.

Johan

2010-10-25 16:28:44

by Elvis Pfutzenreuter

Subject: [PATCH 2/2] Fix coding style and comment

---
health/hdp.c | 2 +-
health/mcap_sync.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/health/hdp.c b/health/hdp.c
index eb27613..7332cd5 100644
--- a/health/hdp.c
+++ b/health/hdp.c
@@ -339,7 +339,7 @@ static DBusMessage *manager_create_application(DBusConnection *conn,
"Can't get sender name");
}

- if (!set_app_path(app)){
+ if (!set_app_path(app)) {
free_application(app);
return g_dbus_create_error(msg,
ERROR_INTERFACE ".HealthError",
diff --git a/health/mcap_sync.c b/health/mcap_sync.c
index 49661a7..57ba0fd 100644
--- a/health/mcap_sync.c
+++ b/health/mcap_sync.c
@@ -350,7 +350,7 @@ static gboolean initialize_caps(struct mcap_mcl *mcl)
clock_gettime(CLK, &t1);
read_btclock_retry(mcl, &btclock, &btaccuracy);

- /* Do clock read a number of times and measure latency */
+ /* Read clock a number of times and measure latency */
avg = 0;
i = 0;
retries = MAX_RETRIES;
--
1.7.0.4