Mercurial > emacs
diff lib-src/ebrowse.c @ 29459:bb40802a0af0
(ymalloc): Renamed from xmalloc.
(yrealloc): Renamed from xrealloc.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Tue, 06 Jun 2000 10:39:01 +0000 |
parents | 7bb3a2b7ff29 |
children | 235fb8ea80a2 |
line wrap: on
line diff
--- a/lib-src/ebrowse.c Tue Jun 06 10:36:48 2000 +0000 +++ b/lib-src/ebrowse.c Tue Jun 06 10:39:01 2000 +0000 @@ -472,7 +472,7 @@ void add_member_decl P_ ((struct sym *, char *, char *, int, unsigned, int, int, int, int)); void dump_roots P_ ((FILE *)); -void *xmalloc P_ ((int)); +void *ymalloc P_ ((int)); void add_global_defn P_ ((char *, char *, int, unsigned, int, int, int)); void add_global_decl P_ ((char *, char *, int, unsigned, int, int, int)); void add_define P_ ((char *, char *, int)); @@ -533,10 +533,12 @@ /* Like malloc but print an error and exit if not enough memory is - available. */ + available. This isn't called `xmalloc' because src/m/alpha.h, + and maybe others, contain an incompatible prototype for xmalloc + and xrealloc. */ void * -xmalloc (nbytes) +ymalloc (nbytes) int nbytes; { void *p = malloc (nbytes); @@ -552,7 +554,7 @@ /* Like realloc but print an error and exit if out of memory. */ void * -xrealloc (p, sz) +yrealloc (p, sz) void *p; int sz; { @@ -574,7 +576,7 @@ char *s; { if (s) - s = strcpy (xmalloc (strlen (s) + 1), s); + s = strcpy (ymalloc (strlen (s) + 1), s); return s; } @@ -627,7 +629,7 @@ puts (name); } - sym = (struct sym *) xmalloc (sizeof *sym + strlen (name)); + sym = (struct sym *) ymalloc (sizeof *sym + strlen (name)); bzero (sym, sizeof *sym); strcpy (sym->name, name); sym->namesp = scope; @@ -656,8 +658,8 @@ /* Avoid duplicates. */ if (p == NULL || p->sym != sub) { - lnk = (struct link *) xmalloc (sizeof *lnk); - lnk2 = (struct link *) xmalloc (sizeof *lnk2); + lnk = (struct link *) ymalloc (sizeof *lnk); + lnk2 = (struct link *) ymalloc (sizeof *lnk2); lnk->sym = sub; lnk->next = p; @@ -953,7 +955,7 @@ int sc; unsigned hash; { - struct member *m = (struct member *) xmalloc (sizeof *m + strlen (name)); + struct member *m = (struct member *) ymalloc (sizeof *m + strlen (name)); struct member **list; struct member *p; struct member *prev; @@ -1065,7 +1067,7 @@ make_namespace (name) char *name; { - struct sym *s = (struct sym *) xmalloc (sizeof *s + strlen (name)); + struct sym *s = (struct sym *) ymalloc (sizeof *s + strlen (name)); bzero (s, sizeof *s); strcpy (s->name, name); s->next = all_namespaces; @@ -1120,7 +1122,7 @@ if (streq (new_name, p->name)) return; - al = (struct alias *) xmalloc (sizeof *al + strlen (new_name)); + al = (struct alias *) ymalloc (sizeof *al + strlen (new_name)); strcpy (al->name, new_name); al->next = p->namesp_aliases; p->namesp_aliases = al; @@ -1138,7 +1140,7 @@ if (namespace_sp == namespace_stack_size) { int size = max (10, 2 * namespace_stack_size); - namespace_stack = (struct sym **) xrealloc (namespace_stack, size); + namespace_stack = (struct sym **) yrealloc (namespace_stack, size); namespace_stack_size = size; } @@ -1198,7 +1200,7 @@ if (scope_buffer_len + len >= scope_buffer_size) { int new_size = max (2 * scope_buffer_size, scope_buffer_len + len); - scope_buffer = (char *) xrealloc (new_size); + scope_buffer = (char *) yrealloc (new_size); scope_buffer_size = new_size; } } @@ -1250,7 +1252,7 @@ if (!scope_buffer) { scope_buffer_size = 1024; - scope_buffer = (char *) xmalloc (scope_buffer_size); + scope_buffer = (char *) ymalloc (scope_buffer_size); } *scope_buffer = '\0'; @@ -1667,7 +1669,7 @@ if (p == yytext_end - 1) { int size = yytext_end - yytext; - yytext = (char *) xrealloc (yytext, 2 * size); + yytext = (char *) yrealloc (yytext, 2 * size); yytext_end = yytext + 2 * size; p = yytext + size - 1; } @@ -1945,7 +1947,7 @@ if (buffer == NULL) { - buffer = (char *) xmalloc (max_regexp); + buffer = (char *) ymalloc (max_regexp); end_buf = &buffer[max_regexp] - 1; } @@ -2090,7 +2092,7 @@ if (yytext == NULL) { int size = 256; - yytext = (char *) xmalloc (size * sizeof *yytext); + yytext = (char *) ymalloc (size * sizeof *yytext); yytext_end = yytext + size; } } @@ -2106,7 +2108,7 @@ { char *s; unsigned h = 0; - struct kw *k = (struct kw *) xmalloc (sizeof *k); + struct kw *k = (struct kw *) ymalloc (sizeof *k); for (s = name; *s; ++s) h = (h << 1) ^ *s; @@ -2129,7 +2131,7 @@ /* Allocate the input buffer */ inbuffer_size = READ_CHUNK_SIZE + 1; - inbuffer = in = (char *) xmalloc (inbuffer_size); + inbuffer = in = (char *) ymalloc (inbuffer_size); yyline = 1; /* Set up character class vectors. */ @@ -2784,7 +2786,7 @@ if (len > id_size) { int new_size = max (len, 2 * id_size); - id = (char *) xrealloc (id, new_size); + id = (char *) yrealloc (id, new_size); id_size = new_size; } strcpy (id, s); @@ -2810,7 +2812,7 @@ if (len > id_size) { int new_size = max (len, 2 * id_size); - id = (char *) xrealloc (id, new_size); + id = (char *) yrealloc (id, new_size); id_size = new_size; } strcpy (id, "operator"); @@ -2826,7 +2828,7 @@ if (len > id_size) { int new_size = max (len, 2 * id_size); - id = (char *) xrealloc (id, new_size); + id = (char *) yrealloc (id, new_size); id_size = new_size; } @@ -2864,7 +2866,7 @@ int len = strlen (yytext) + 1; if (len > id_size) { - id = (char *) xrealloc (id, len); + id = (char *) yrealloc (id, len); id_size = len; } strcpy (id, yytext); @@ -2904,7 +2906,7 @@ int len = strlen (yytext) + 1; if (len > id_size) { - id = (char *) xrealloc (id, len); + id = (char *) yrealloc (id, len); id_size = len; } strcpy (id, yytext); @@ -3350,8 +3352,8 @@ while (*path_list && *path_list != PATH_LIST_SEPARATOR) ++path_list; - p = (struct search_path *) xmalloc (sizeof *p); - p->path = (char *) xmalloc (path_list - start + 1); + p = (struct search_path *) ymalloc (sizeof *p); + p->path = (char *) ymalloc (path_list - start + 1); memcpy (p->path, start, path_list - start); p->path[path_list - start] = '\0'; p->next = NULL; @@ -3393,7 +3395,7 @@ if (len + 1 >= buffer_size) { buffer_size = max (len + 1, 2 * buffer_size); - buffer = (char *) xrealloc (buffer, buffer_size); + buffer = (char *) yrealloc (buffer, buffer_size); } strcpy (buffer, path->path); @@ -3488,7 +3490,7 @@ if (nread + READ_CHUNK_SIZE >= inbuffer_size) { inbuffer_size = nread + READ_CHUNK_SIZE + 1; - inbuffer = (char *) xrealloc (inbuffer, inbuffer_size); + inbuffer = (char *) yrealloc (inbuffer, inbuffer_size); } nbytes = fread (inbuffer + nread, 1, READ_CHUNK_SIZE, fp); @@ -3528,7 +3530,7 @@ if (i >= buffer_size) { buffer_size = max (100, buffer_size * 2); - buffer = (char *) xrealloc (buffer, buffer_size); + buffer = (char *) yrealloc (buffer, buffer_size); } buffer[i++] = c; @@ -3540,7 +3542,7 @@ if (i == buffer_size) { buffer_size = max (100, buffer_size * 2); - buffer = (char *) xrealloc (buffer, buffer_size); + buffer = (char *) yrealloc (buffer, buffer_size); } buffer[i] = '\0'; @@ -3588,7 +3590,7 @@ if (n_input_files == input_filenames_size) { input_filenames_size = max (10, 2 * input_filenames_size); - input_filenames = (char **) xrealloc (input_filenames, + input_filenames = (char **) yrealloc (input_filenames, input_filenames_size); } input_filenames[n_input_files++] = xstrdup (optarg);