X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/458bfed397af18e460d01b888d1da095b6b95034..943a56c7b3c7ccc192adb371e9d47bc568d15576:/src/tparam.c

diff --git a/src/tparam.c b/src/tparam.c
index ac21667d65..2c72db3dfa 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -1,6 +1,6 @@
 /* Merge parameters into a termcap entry string.
-   Copyright (C) 1985, 1987, 1993, 1995, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+   Copyright (C) 1985, 1987, 1993, 1995, 2000-2008, 2013-2014 Free
+   Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -13,19 +13,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Emacs config.h may rename various library functions such as malloc.  */
 #include <config.h>
-#include <setjmp.h>
+
 #include "lisp.h"		/* for xmalloc */
 #include "tparam.h"
-
-#ifndef NULL
-#define NULL (char *) 0
-#endif
 
 /* Assuming STRING is the value of a termcap string entry
    containing `%' constructs to expand parameters,
@@ -85,7 +79,7 @@ tparam1 (const char *string, char *outstring, int len,
   register int tem;
   int *old_argp = argp;                 /* can move */
   int *fixed_argp = argp;               /* never moves */
-  int explicit_param_p = 0;             /* set by %p */
+  bool explicit_param_p = 0;            /* set by %p */
   ptrdiff_t doleft = 0;
   ptrdiff_t doup = 0;
   ptrdiff_t append_len = 0;
@@ -102,7 +96,7 @@ tparam1 (const char *string, char *outstring, int len,
 	  if (outlen == 0)
 	    {
 	      outlen = len + 40;
-	      new = (char *) xmalloc (outlen);
+	      new = xmalloc_atomic (outlen);
 	      memcpy (new, outstring, offset);
 	    }
 	  else
@@ -251,7 +245,7 @@ tparam1 (const char *string, char *outstring, int len,
 	      break;
 
 	    default:
-	      abort ();
+	      emacs_abort ();
 	    }
 	}
       else