Re: emacs' turn: remove useless if-before-free tests

[Emanuele Giaquinta <emanuele.giaquinta@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

On Mon, Jun 02, 2008 at 08:14:18AM +0200, Jim Meyering wrote:

> Stefan Monnier <monnier@iro.umontreal.ca> wrote:
> > Sounds like a good cleanup.
> > Feel free to install it unless there's a strong objection.
> 
> Thanks.  I've committed those three change sets.

This patch introduced a problem on os x, free on os x is redirected to
unexmacosx.c:unexec_free, which does not support a NULL argument in an
undumped emacs. The attached patch changes the problematic free call to
xfree, as done a few lines below for another pointer.

Emanuele

[-- Attachment #2: free.diff --]
[-- Type: text/x-diff, Size: 314 bytes --]

diff --git a/src/lread.c b/src/lread.c
index e5e77bc..3e0bd1f 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1269,7 +1269,7 @@ Return t if the file exists and loads successfully.  */)
 
   UNGCPRO;
 
-  free (saved_doc_string);
+  xfree (saved_doc_string);
   saved_doc_string = 0;
   saved_doc_string_size = 0;