From: BT Templeton <bt@hcoop.net>
Date: Mon, 16 Sep 2013 21:31:31 +0000 (-0400)
Subject: delete_temp_file fix
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/d43b5e84066afe4ee7100ab957438a1c41141492

delete_temp_file fix

* src/callproc.c (delete_temp_file_ptr): New function.
  (call_process_kill): Use it.
---

diff --git a/src/callproc.c b/src/callproc.c
index 56bdc7de0e..cbd516a71d 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -156,13 +156,19 @@ record_kill_process (struct Lisp_Process *p, Lisp_Object tempfile)
 /* Clean up files, file descriptors and processes created by Fcall_process.  */
 
 static void
-delete_temp_file_ptr (Lisp_Object *name_ptr)
+delete_temp_file (Lisp_Object name)
 {
-  Lisp_Object name = *name_ptr;
   if (! NILP (name))
     unlink (SSDATA (name));
 }
 
+static void
+delete_temp_file_ptr (Lisp_Object *name_ptr)
+{
+  if (name_ptr)
+    delete_temp_file (*name_ptr);
+}
+
 static void
 call_process_kill (void *ptr)
 {
@@ -181,7 +187,7 @@ call_process_kill (void *ptr)
       synch_process_pid = 0;
     }
   else if (STRINGP (synch_process_tempfile))
-    delete_temp_file_ptr (&synch_process_tempfile);
+    delete_temp_file (synch_process_tempfile);
 }
 
 /* Clean up when exiting Fcall_process: restore the buffer, and