HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-commit of generated files.
[bpt/emacs.git]
/
src
/
termcap.c
diff --git
a/src/termcap.c
b/src/termcap.c
index
61f9d9a
..
e494cd1
100644
(file)
--- a/
src/termcap.c
+++ b/
src/termcap.c
@@
-19,7
+19,6
@@
Boston, MA 02110-1301, USA. */
/* Emacs config.h may rename various library functions such as malloc. */
#include <config.h>
/* Emacs config.h may rename various library functions such as malloc. */
#include <config.h>
-#include <setjmp.h>
#include <sys/file.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/file.h>
#include <fcntl.h>
#include <unistd.h>
@@
-153,7
+152,7
@@
tgetst1 (char *ptr, char **area)
p = ptr;
while ((c = *p++) && c != ':' && c != '\n')
;
p = ptr;
while ((c = *p++) && c != ':' && c != '\n')
;
- ret =
(char *)
xmalloc (p - ptr + 1);
+ ret = xmalloc (p - ptr + 1);
}
else
ret = *area;
}
else
ret = *area;
@@
-377,7
+376,7
@@
tgetent (char *bp, const char *name)
if (!bp)
{
malloc_size = 1 + strlen (term);
if (!bp)
{
malloc_size = 1 + strlen (term);
- bp =
(char *)
xmalloc (malloc_size);
+ bp = xmalloc (malloc_size);
}
strcpy (bp, term);
goto ret;
}
strcpy (bp, term);
goto ret;
@@
-440,13
+439,13
@@
tgetent (char *bp, const char *name)
buf.size = BUFSIZE;
/* Add 1 to size to ensure room for terminating null. */
buf.size = BUFSIZE;
/* Add 1 to size to ensure room for terminating null. */
- buf.beg =
(char *)
xmalloc (buf.size + 1);
+ buf.beg = xmalloc (buf.size + 1);
term = indirect ? indirect : (char *)name;
if (!bp)
{
malloc_size = indirect ? strlen (tcenv) + 1 : buf.size;
term = indirect ? indirect : (char *)name;
if (!bp)
{
malloc_size = indirect ? strlen (tcenv) + 1 : buf.size;
- bp =
(char *)
xmalloc (malloc_size);
+ bp = xmalloc (malloc_size);
}
tc_search_point = bp1 = bp;
}
tc_search_point = bp1 = bp;
@@
-478,7
+477,7
@@
tgetent (char *bp, const char *name)
{
ptrdiff_t offset1 = bp1 - bp, offset2 = tc_search_point - bp;
malloc_size = offset1 + buf.size;
{
ptrdiff_t offset1 = bp1 - bp, offset2 = tc_search_point - bp;
malloc_size = offset1 + buf.size;
- bp = termcap_name =
(char *)
xrealloc (bp, malloc_size);
+ bp = termcap_name = xrealloc (bp, malloc_size);
bp1 = termcap_name + offset1;
tc_search_point = termcap_name + offset2;
}
bp1 = termcap_name + offset1;
tc_search_point = termcap_name + offset2;
}
@@
-504,7
+503,7
@@
tgetent (char *bp, const char *name)
xfree (buf.beg);
if (malloc_size)
xfree (buf.beg);
if (malloc_size)
- bp =
(char *)
xrealloc (bp, bp1 - bp + 1);
+ bp = xrealloc (bp, bp1 - bp + 1);
ret:
term_entry = bp;
ret:
term_entry = bp;