DVR: fix for the previous commit

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index 012574d4d6ef74cd6781f35c52b099fa947e36fc..a342b0cd54581c442cdb4f0a14af6315180e9876 100644 (file)
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -3030,11 +3030,12 @@ dvr_entry_class_autorec_caption_get(void *o)
   dvr_entry_t *de = (dvr_entry_t *)o;
   dvr_autorec_entry_t *dae = de->de_autorec;
   if (dae) {
+    const int comment = !strempty(dae->dae_comment);
     snprintf(prop_sbuf, PROP_SBUF_LEN, "%s%s%s%s",
              dae->dae_name ?: "",
-             (dae->dae_comment != '\0' && strcmp(dae->dae_comment,"") != 0) ? " (" : "",
-             (dae->dae_comment != '\0' && strcmp(dae->dae_comment,"") != 0) ? dae->dae_comment : "",
-             (dae->dae_comment != '\0' && strcmp(dae->dae_comment,"") != 0) ? ")" : "");
+             comment ? " (" : "",
+             comment ? dae->dae_comment : "",
+             comment ? ")" : "");
   } else
     prop_sbuf[0] = '\0';
   return &prop_sbuf_ptr;

diff --git a/src/lang_str.c b/src/lang_str.c
index ce00a3a56143642ce617219488acd78090f0f4dc..09ef3b3b55fdbfc43adbc7733c4fde48609fb3c0 100644 (file)
--- a/src/lang_str.c
+++ b/src/lang_str.c
@@ -342,14 +342,6 @@ int lang_str_compare( const lang_str_t *ls1, const lang_str_t *ls2 )
   return 0;
 }
 
-int strempty(const char* c) {
-  return !c || c[0] == 0;
-}
-
-int lang_str_empty(lang_str_t* str) {
-  return strempty(lang_str_get(str, NULL));
-}
-
 size_t lang_str_size(const lang_str_t *ls)
 {
   lang_str_ele_t *e;

diff --git a/src/lang_str.h b/src/lang_str.h
index 1f21e707c379c72caf55d035be8c6fb89ff6ade7..e140b536c7652e4a03a07a929bcb4d0d43ff9555 100644 (file)
--- a/src/lang_str.h
+++ b/src/lang_str.h
@@ -74,10 +74,10 @@ lang_str_t     *lang_str_deserialize
 int             lang_str_compare ( const lang_str_t *ls1, const lang_str_t *ls2 );
 
 /* Is string empty? */
-int             strempty(const char* c)
-    __attribute__((warn_unused_result));
-int             lang_str_empty(lang_str_t* str)
-    __attribute__((warn_unused_result));
+static inline int strempty(const char *c)
+  { return c == NULL || *c == '\0'; }
+static inline int lang_str_empty(lang_str_t* str)
+  { return strempty(lang_str_get(str, NULL)); }
 
 /* Size in bytes */
 size_t          lang_str_size ( const lang_str_t *ls );