Replace streq with ca_streq

Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
Signed-off-by: Lennart Poettering <lennart@poettering.net>

7 files changed, 15 insertions, 15 deletions

diff --git a/src/alsa.c b/src/alsa.c
index 14156f3..a1dea98 100644
--- a/src/alsa.c
+++ b/src/alsa.c
@@ -84,7 +84,7 @@ int driver_open(ca_context *c) {
     struct private *p;
 
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
-    ca_return_val_if_fail(!c->driver || streq(c->driver, "alsa"), CA_ERROR_NODRIVER);
+    ca_return_val_if_fail(!c->driver || ca_streq(c->driver, "alsa"), CA_ERROR_NODRIVER);
     ca_return_val_if_fail(!PRIVATE(c), CA_ERROR_STATE);
 
     if (!(c->private = p = ca_new0(struct private, 1)))
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;
diff --git a/src/dso.c b/src/dso.c
index 31db543..02eb672 100644
--- a/src/dso.c
+++ b/src/dso.c
@@ -106,7 +106,7 @@ static int lt_error_from_string(const char *t) {
     const struct lt_error_code *c;
 
     for (c = lt_error_codes; c->text; c++)
-        if (streq(t, c->text))
+        if (ca_streq(t, c->text))
             return c->code;
 
     return -1;
diff --git a/src/macro.h b/src/macro.h
index c57c922..4b9324f 100644
--- a/src/macro.h
+++ b/src/macro.h
@@ -245,6 +245,6 @@ typedef void (*ca_free_cb_t)(void *);
  #define PA_UINT32_TO_BE(x) PA_UINT32_SWAP(x)
 #endif
 
-#define streq(a, b) (strcmp((a),(b)) == 0)
+#define ca_streq(a, b) (strcmp((a),(b)) == 0)
 
 #endif
diff --git a/src/null.c b/src/null.c
index dd33808..2412786 100644
--- a/src/null.c
+++ b/src/null.c
@@ -30,7 +30,7 @@
 
 int driver_open(ca_context *c) {
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
-    ca_return_val_if_fail(!c->driver || streq(c->driver, "null"), CA_ERROR_NODRIVER);
+    ca_return_val_if_fail(!c->driver || ca_streq(c->driver, "null"), CA_ERROR_NODRIVER);
 
     return CA_SUCCESS;
 }
diff --git a/src/pulse.c b/src/pulse.c
index 1d64c86..785c967 100644
--- a/src/pulse.c
+++ b/src/pulse.c
@@ -248,7 +248,7 @@ int driver_open(ca_context *c) {
     int ret;
 
     ca_return_val_if_fail(c, CA_ERROR_INVALID);
-    ca_return_val_if_fail(!c->driver || streq(c->driver, "pulse"), CA_ERROR_NODRIVER);
+    ca_return_val_if_fail(!c->driver || ca_streq(c->driver, "pulse"), CA_ERROR_NODRIVER);
     ca_return_val_if_fail(!PRIVATE(c), CA_ERROR_STATE);
 
     if (!(c->private = p = ca_new0(struct private, 1)))
diff --git a/src/sound-theme-spec.c b/src/sound-theme-spec.c
index 02b8de2..8bea151 100644
--- a/src/sound-theme-spec.c
+++ b/src/sound-theme-spec.c
@@ -82,7 +82,7 @@ static ca_bool_t data_dir_matches(ca_data_dir *d, const char*output_profile) {
 
     /* We might want to add more elaborate matching here eventually */
 
-    return streq(d->output_profile, output_profile);
+    return ca_streq(d->output_profile, output_profile);
 }
 
 static ca_data_dir* find_data_dir(ca_theme_data *t, const char *name) {
@@ -92,7 +92,7 @@ static ca_data_dir* find_data_dir(ca_theme_data *t, const char *name) {
     ca_assert(name);
 
     for (d = t->data_dirs; d; d = d->next)
-        if (streq(d->name, name))
+        if (ca_streq(d->name, name))
             return d;
 
     return NULL;
@@ -166,7 +166,7 @@ static int load_theme_path(ca_theme_data *t, const char *prefix, const char *nam
         if (!ln[0])
             continue;
 
-        if (streq(ln, "[Sound Theme]")) {
+        if (ca_streq(ln, "[Sound Theme]")) {
             in_sound_theme_section = TRUE;
             current_data_dir = NULL;
             continue;
@@ -243,7 +243,7 @@ static int load_theme_path(ca_theme_data *t, const char *prefix, const char *nam
 
             if (!strncmp(ln, "OutputProfile=", 14)) {
 
-                if (current_data_dir->output_profile && !streq(current_data_dir->output_profile, ln+14)) {
+                if (current_data_dir->output_profile && !ca_streq(current_data_dir->output_profile, ln+14)) {
                     ret = CA_ERROR_CORRUPT;
                     goto fail;
                 }
@@ -309,7 +309,7 @@ static int load_theme_dir(ca_theme_data *t, const char *name) {
     if ((ret = get_data_home(&e)) < 0)
         return ret;
 
-    if (streq(name, FALLBACK_THEME))
+    if (ca_streq(name, FALLBACK_THEME))
         t->loaded_fallback_theme = TRUE;
 
     if (e) {
@@ -358,7 +358,7 @@ static int load_theme_data(ca_theme_data **_t, const char *name) {
     ca_return_val_if_fail(name, CA_ERROR_INVALID);
 
     if (*_t)
-        if (streq((*_t)->name, name))
+        if (ca_streq((*_t)->name, name))
             return CA_SUCCESS;
 
     if (!(t = ca_new0(ca_theme_data, 1)))
@@ -520,7 +520,7 @@ static int find_sound_for_subname(ca_sound_file **f, ca_theme_data *t, const cha
             return ret;
 
         /* Then, fall back to stereo */
-        if (!streq(profile, DEFAULT_OUTPUT_PROFILE))
+        if (!ca_streq(profile, DEFAULT_OUTPUT_PROFILE))
             if ((ret = find_sound_for_profile(f, t, name, locale, DEFAULT_OUTPUT_PROFILE)) != CA_ERROR_NOTFOUND)
                 return ret;
     }