DVR: fix for the previous commit

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index 5f02b1180c1c06eb30a3ed2ebdbd0b5ea40c5de2..d3766e4b966ed7354e751a970482d4a65f07377f 100644 (file)
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -2822,11 +2822,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 fd9cf0b0cce5f0e504fe3a706236decc80ef45ac..0296f86d1c8ae26ab6dd959b75385156e3a1d19e 100644 (file)
--- a/src/lang_str.c
+++ b/src/lang_str.c
@@ -303,14 +303,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 d31dbddfdada86e3972d445e86dac79d5d76f76c..24d2d30560c6f190ccb2f478bba707a795454576 100644 (file)
--- a/src/lang_str.h
+++ b/src/lang_str.h
@@ -64,9 +64,11 @@ lang_str_t     *lang_str_deserialize
 /* Compare */
 int             lang_str_compare ( const lang_str_t *ls1, const lang_str_t *ls2 );
 
-/* Empty */
-int             strempty(const char* c);
-int             lang_str_empty(lang_str_t* str);
+/* Is string empty? */
+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 );