tidy uses of mutt_str_getenv

diff --git a/init.c b/init.c
index a3d12925dc8ddaf290af4ab424beba65742707e1..3fb531b5f1990a0b88a646e68af14d7295b39865 100644 (file)
--- a/init.c
+++ b/init.c
@@ -3796,9 +3796,8 @@ int mutt_init(int skip_sys_rc, struct ListHead *commands)
 
 #ifndef LOCALES_HACK
   /* Do we have a locale definition? */
-  if (((p = mutt_str_getenv("LC_ALL")) != NULL && p[0]) ||
-      ((p = mutt_str_getenv("LANG")) != NULL && p[0]) ||
-      ((p = mutt_str_getenv("LC_CTYPE")) != NULL && p[0]))
+  if ((p = mutt_str_getenv("LC_ALL")) || (p = mutt_str_getenv("LANG")) ||
+      (p = mutt_str_getenv("LC_CTYPE")))
   {
     OPT_LOCALES = true;
   }

diff --git a/muttlib.c b/muttlib.c
index 57a3d1c5bbfc4e79c749ac6ee50764e746abbed6..52145b88a43c1f4943f38eb2b0ae2011970f614d 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -1425,8 +1425,7 @@ void mutt_encode_path(char *dest, size_t dlen, const char *src)
 int mutt_set_xdg_path(enum XdgType type, char *buf, size_t bufsize)
 {
   const char *xdg_env = mutt_str_getenv(xdg_env_vars[type]);
-  char *xdg = (xdg_env && *xdg_env) ? mutt_str_strdup(xdg_env) :
-                                      mutt_str_strdup(xdg_defaults[type]);
+  char *xdg = xdg_env ? mutt_str_strdup(xdg_env) : mutt_str_strdup(xdg_defaults[type]);
   char *x = xdg; /* strsep() changes xdg, so free x instead later */
   char *token = NULL;
   int rc = 0;