Simplify init_lread() branch and fix comments

Simplify init_lread() branch and fix comments

[Chris Gregory]

This patch moves the comments before the branch in init_lread() to the
correct locations, and simplifies the branch because (true && a) == a.
-- 
Chris Gregory

Diff:

diff --git a/src/lread.c b/src/lread.c
index 35348f1..23ebc8f 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4430,17 +4430,13 @@ load_path_default (void)
 void
 init_lread (void)
 {
-  /* First, set Vload_path.  */
-
-  /* Ignore EMACSLOADPATH when dumping.  */
-#ifdef CANNOT_DUMP
-  bool use_loadpath = true;
-#else
-  bool use_loadpath = NILP (Vpurify_flag);
-#endif
-
-  if (use_loadpath && egetenv ("EMACSLOADPATH"))
+  if (
+#ifndef CANNOT_DUMP
+      NILP (Vpurify_flag) &&
+#endif
+      egetenv ("EMACSLOADPATH"))
     {
+      /* First, set Vload_path.  */
       Vload_path = decode_env_path ("EMACSLOADPATH", 0, 1);
 
       /* Check (non-nil) user-supplied elements.  */
@@ -4479,6 +4475,7 @@ init_lread (void)
     }
   else
     {
+      /* Ignore EMACSLOADPATH when dumping.  */
       Vload_path = load_path_default ();
 
       /* Check before adding site-lisp directories.

Re: Simplify init_lread() branch and fix comments

[Andreas Schwab]

On Dez 27 2016, Chris Gregory <czipperz@gmail.com> wrote:

> diff --git a/src/lread.c b/src/lread.c
> index 35348f1..23ebc8f 100644
> --- a/src/lread.c
> +++ b/src/lread.c
> @@ -4430,17 +4430,13 @@ load_path_default (void)
>  void
>  init_lread (void)
>  {
> -  /* First, set Vload_path.  */
> -
> -  /* Ignore EMACSLOADPATH when dumping.  */
> -#ifdef CANNOT_DUMP
> -  bool use_loadpath = true;
> -#else
> -  bool use_loadpath = NILP (Vpurify_flag);
> -#endif
> -
> -  if (use_loadpath && egetenv ("EMACSLOADPATH"))
> +  if (
> +#ifndef CANNOT_DUMP
> +      NILP (Vpurify_flag) &&
> +#endif
> +      egetenv ("EMACSLOADPATH"))
>      {

That makes it worse, and violates the GNU coding style.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Simplify init_lread() branch and fix comments

[Eli Zaretskii]

> From: Andreas Schwab <schwab@linux-m68k.org>
> Date: Wed, 28 Dec 2016 09:52:56 +0100
> Cc: emacs-devel@gnu.org
> 
> > diff --git a/src/lread.c b/src/lread.c
> > index 35348f1..23ebc8f 100644
> > --- a/src/lread.c
> > +++ b/src/lread.c
> > @@ -4430,17 +4430,13 @@ load_path_default (void)
> >  void
> >  init_lread (void)
> >  {
> > -  /* First, set Vload_path.  */
> > -
> > -  /* Ignore EMACSLOADPATH when dumping.  */
> > -#ifdef CANNOT_DUMP
> > -  bool use_loadpath = true;
> > -#else
> > -  bool use_loadpath = NILP (Vpurify_flag);
> > -#endif
> > -
> > -  if (use_loadpath && egetenv ("EMACSLOADPATH"))
> > +  if (
> > +#ifndef CANNOT_DUMP
> > +      NILP (Vpurify_flag) &&
> > +#endif
> > +      egetenv ("EMACSLOADPATH"))
> >      {
> 
> That makes it worse, and violates the GNU coding style.

Agreed.