diff options
| author | Andreas Schwab | 2008-12-22 09:48:21 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-12-22 09:48:21 +0000 |
| commit | 8b1463121ee4758f36e3fb78e3afb764ef6fea0e (patch) | |
| tree | 6a5bc9df405b8d9e04631ba3ed3c319a6d63d639 /src | |
| parent | 56f2de103fd8ee430ae3d2f6a1b83d4aa2012f90 (diff) | |
| download | emacs-8b1463121ee4758f36e3fb78e3afb764ef6fea0e.tar.gz emacs-8b1463121ee4758f36e3fb78e3afb764ef6fea0e.zip | |
* buffer.c (init_buffer): Use realloc instead of xrealloc.
* gtkutil.c (free_widget_value): Use xfree instead of free.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/buffer.c | 4 | ||||
| -rw-r--r-- | src/gtkutil.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 844b641d696..7c7b327f274 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-12-22 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * buffer.c (init_buffer): Use realloc instead of xrealloc. | ||
| 4 | * gtkutil.c (free_widget_value): Use xfree instead of free. | ||
| 5 | |||
| 1 | 2008-12-22 Martin Rudalics <rudalics@gmx.at> | 6 | 2008-12-22 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * frame.c (delete_frame): New function derived from | 8 | * frame.c (delete_frame): New function derived from |
diff --git a/src/buffer.c b/src/buffer.c index 50db471ae12..110cb4f7faf 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5343,7 +5343,9 @@ init_buffer () | |||
| 5343 | if (!(IS_DIRECTORY_SEP (pwd[len - 1]))) | 5343 | if (!(IS_DIRECTORY_SEP (pwd[len - 1]))) |
| 5344 | { | 5344 | { |
| 5345 | /* Grow buffer to add directory separator and '\0'. */ | 5345 | /* Grow buffer to add directory separator and '\0'. */ |
| 5346 | pwd = (char *) xrealloc (pwd, len + 2); | 5346 | pwd = (char *) realloc (pwd, len + 2); |
| 5347 | if (!pwd) | ||
| 5348 | fatal ("`get_current_dir_name' failed: %s\n", strerror (errno)); | ||
| 5347 | pwd[len] = DIRECTORY_SEP; | 5349 | pwd[len] = DIRECTORY_SEP; |
| 5348 | pwd[len + 1] = '\0'; | 5350 | pwd[len + 1] = '\0'; |
| 5349 | } | 5351 | } |
diff --git a/src/gtkutil.c b/src/gtkutil.c index 5f55e6daef6..506c3501662 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -224,7 +224,7 @@ free_widget_value (wv) | |||
| 224 | { | 224 | { |
| 225 | /* When the number of already allocated cells is too big, | 225 | /* When the number of already allocated cells is too big, |
| 226 | We free it. */ | 226 | We free it. */ |
| 227 | free (wv); | 227 | xfree (wv); |
| 228 | malloc_cpt--; | 228 | malloc_cpt--; |
| 229 | } | 229 | } |
| 230 | else | 230 | else |