HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid recursive `require' when loading semantic
[bpt/emacs.git]
/
src
/
termcap.c
diff --git
a/src/termcap.c
b/src/termcap.c
index
f081926
..
702d30b
100644
(file)
--- a/
src/termcap.c
+++ b/
src/termcap.c
@@
-1,5
+1,5
@@
/* Work-alike for termcap, plus extra features.
/* Work-alike for termcap, plus extra features.
- Copyright (C) 1985-1986, 1993-1995, 2000-2008, 2011, 2013 Free
+ Copyright (C) 1985-1986, 1993-1995, 2000-2008, 2011, 2013
-2014
Free
Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@
-150,7
+150,7
@@
tgetst1 (char *ptr, char **area)
p = ptr;
while ((c = *p++) && c != ':' && c != '\n')
;
p = ptr;
while ((c = *p++) && c != ':' && c != '\n')
;
- ret = xmalloc (p - ptr + 1);
+ ret = xmalloc
_atomic
(p - ptr + 1);
}
else
ret = *area;
}
else
ret = *area;
@@
-374,7
+374,7
@@
tgetent (char *bp, const char *name)
if (!bp)
{
malloc_size = 1 + strlen (term);
if (!bp)
{
malloc_size = 1 + strlen (term);
- bp = xmalloc (malloc_size);
+ bp = xmalloc
_atomic
(malloc_size);
}
strcpy (bp, term);
goto ret;
}
strcpy (bp, term);
goto ret;
@@
-433,13
+433,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 = xmalloc (buf.size + 1);
+ buf.beg = xmalloc
_atomic
(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 = xmalloc (malloc_size);
+ bp = xmalloc
_atomic
(malloc_size);
}
tc_search_point = bp1 = bp;
}
tc_search_point = bp1 = bp;