X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/6a43ef8e8508df7d732e639ec75f657f4363e27a..01fcc3a532872b29784a4d888ab9cc1aef0eed01:/src/tparam.c
diff --git a/src/tparam.c b/src/tparam.c
index ac21667d65..c3ecfb9e3a 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 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 . */
/* Emacs config.h may rename various library functions such as malloc. */
#include
-#include
+
#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,
@@ -102,7 +96,7 @@ tparam1 (const char *string, char *outstring, int len,
if (outlen == 0)
{
outlen = len + 40;
- new = (char *) xmalloc (outlen);
+ new = xmalloc (outlen);
memcpy (new, outstring, offset);
}
else
@@ -251,7 +245,7 @@ tparam1 (const char *string, char *outstring, int len,
break;
default:
- abort ();
+ emacs_abort ();
}
}
else