From 0ec4a7c40d36b9c25f3d2e3f82e2323c98077e55 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Wed, 25 Jun 2008 00:28:53 +0300 Subject: Replace streq with ca_streq MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc-André Lureau Signed-off-by: Lennart Poettering --- src/common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/common.c') diff --git a/src/common.c b/src/common.c index 71b887a..1e57e94 100644 --- a/src/common.c +++ b/src/common.c @@ -703,11 +703,11 @@ int ca_parse_cache_control(ca_cache_control_t *control, const char *c) { ca_return_val_if_fail(control, CA_ERROR_INVALID); ca_return_val_if_fail(c, CA_ERROR_INVALID); - if (streq(c, "never")) + if (ca_streq(c, "never")) *control = CA_CACHE_CONTROL_NEVER; - else if (streq(c, "permanent")) + else if (ca_streq(c, "permanent")) *control = CA_CACHE_CONTROL_PERMANENT; - else if (streq(c, "volatile")) + else if (ca_streq(c, "volatile")) *control = CA_CACHE_CONTROL_VOLATILE; else return CA_ERROR_INVALID; -- cgit From 67a93bb292c91572b3745428ec04939e58eb349e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 25 Jun 2008 01:30:57 +0200 Subject: fix another s/streq/ca_streq/ --- src/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common.c') diff --git a/src/common.c b/src/common.c index 1e57e94..260c461 100644 --- a/src/common.c +++ b/src/common.c @@ -532,12 +532,12 @@ int ca_context_play_full(ca_context *c, uint32_t id, ca_proplist *p, ca_finish_c ca_mutex_lock(c->props->mutex); if ((t = ca_proplist_gets_unlocked(c->props, CA_PROP_CANBERRA_ENABLE))) - enabled = !streq(t, "0"); + enabled = !ca_streq(t, "0"); ca_mutex_unlock(c->props->mutex); ca_mutex_lock(p->mutex); if ((t = ca_proplist_gets_unlocked(p, CA_PROP_CANBERRA_ENABLE))) - enabled = !streq(t, "0"); + enabled = !ca_streq(t, "0"); ca_mutex_unlock(p->mutex); ca_return_val_if_fail_unlock(enabled, CA_ERROR_DISABLED, c->mutex); -- cgit