aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Love2003-06-11 11:43:52 +0000
committerDave Love2003-06-11 11:43:52 +0000
commitb23c0a83dce8ac43d8005a4eb7c09e5675e7c864 (patch)
treee14278244887b77e7dcc85a799c23c8a95eab25b /src
parent72f295ec18bc831ee879e4f140f552d16a8eada8 (diff)
downloademacs-b23c0a83dce8ac43d8005a4eb7c09e5675e7c864.tar.gz
emacs-b23c0a83dce8ac43d8005a4eb7c09e5675e7c864.zip
(shrink_regexp_cache): Use xrealloc.
(syms_of_search): Use xmalloc.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/search.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 361877bf7b7..d09e65606da 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12003-06-11 Dave Love <fx@gnu.org>
2
3 * search.c (shrink_regexp_cache): Use xrealloc.
4 (syms_of_search): Use xmalloc.
5
12003-06-10 Kim F. Storm <storm@cua.dk> 62003-06-10 Kim F. Storm <storm@cua.dk>
2 7
3 * xdisp.c (phys_cursor_in_rect_p): Fix 2003-05-24 change. 8 * xdisp.c (phys_cursor_in_rect_p): Fix 2003-05-24 change.
@@ -22,6 +27,8 @@
22 27
232003-06-05 Dave Love <fx@gnu.org> 282003-06-05 Dave Love <fx@gnu.org>
24 29
30 * strftime.c: Merge changes from gnulib.
31
25 * mktime.c (__mktime_internal): Merge changes from gnulib 32 * mktime.c (__mktime_internal): Merge changes from gnulib
26 involving year 69 and dst2. 33 involving year 69 and dst2.
27 34
diff --git a/src/search.c b/src/search.c
index 0170838b599..89a4a5ad68e 100644
--- a/src/search.c
+++ b/src/search.c
@@ -183,7 +183,7 @@ shrink_regexp_cache ()
183 { 183 {
184 cp->buf.allocated = cp->buf.used; 184 cp->buf.allocated = cp->buf.used;
185 cp->buf.buffer 185 cp->buf.buffer
186 = (unsigned char *) realloc (cp->buf.buffer, cp->buf.used); 186 = (unsigned char *) xrealloc (cp->buf.buffer, cp->buf.used);
187 } 187 }
188} 188}
189 189
@@ -2901,7 +2901,7 @@ syms_of_search ()
2901 for (i = 0; i < REGEXP_CACHE_SIZE; ++i) 2901 for (i = 0; i < REGEXP_CACHE_SIZE; ++i)
2902 { 2902 {
2903 searchbufs[i].buf.allocated = 100; 2903 searchbufs[i].buf.allocated = 100;
2904 searchbufs[i].buf.buffer = (unsigned char *) malloc (100); 2904 searchbufs[i].buf.buffer = (unsigned char *) xmalloc (100);
2905 searchbufs[i].buf.fastmap = searchbufs[i].fastmap; 2905 searchbufs[i].buf.fastmap = searchbufs[i].fastmap;
2906 searchbufs[i].regexp = Qnil; 2906 searchbufs[i].regexp = Qnil;
2907 staticpro (&searchbufs[i].regexp); 2907 staticpro (&searchbufs[i].regexp);