configure.ac: Check declarations for asprintf and vasprintf.
* configure.ac: Check declarations for asprintf and vasprintf. * config.in: Regenerate. * configure: Likewise. * charset.c (conversion_loop): Use XRESIZEVEC. (convert_no_conversion): Likewise. (convert_using_iconv): Likewise. (init_iconv_desc): Cast return value of alloca. (cpp_host_to_exec_charset): Use XNEWVEC. (emit_numeric_escape): Use XRESIZEVEC. (cpp_interpret_string): Use XNEWVEC. (cpp_interpret_string): Use XRESIZEVEC. (_cpp_interpret_identifier): Cast return value of alloca. (_cpp_convert_input): Use XNEWVEC and XRESIZEVEC. * directives.c (glue_header_name): Use XNEWVEC and XRESIZEVEC. (parse_include): Use XNEWVEC. (insert_pragma_entry): Rename local variable "new" to "new_entry". (save_registered_pragmas): Cast return value of xmemdup. (destringize_and_run): Same for alloca. (parse_assertion): Likewise. (do_assert): Cast allocated storage to proper type. (cpp_define): Likewise. (_cpp_define_builtin): Likewise. (cpp_undef): Likewise. (handle_assertion): Likewise. (cpp_push_buffer): Rename local variable "new" to "new_buffer". * expr.c (CPP_UPLUS): Cast value to type cpp_ttype. (CPP_UMINUS): Likewise. (struct cpp_operator): Rename from struct operator. (_cpp_expand_op_stack): Use XRESIZEVEC. * files.c (pch_open_file): Use XNEWVEC. (pch_open_file): Use XRESIZEVEC. (read_file_guts): Use XNEWVEC and XRESIZEVEC. (dir_name_of_file): Use XNEWVEC. (make_cpp_file): Use XCNEW. (make_cpp_dir): Likewise. (allocate_file_hash_entries): USE XNEWVEC. (cpp_included): Cast return value of htab_find_with_hash. (append_file_to_dir): Use XNEWVEC. (read_filename_string): Likewise. Use XRESIZEVEC too. (read_name_map): Cast return value of alloca. Use XRESIZEVEC. (remap_filename): Use XNEWVEC. (struct pchf_entry): Move definition out of struct pchf_data. (_cpp_save_file_entries): Use XCNEWVAR. (_cpp_read_file_entries): Use XNEWVAR. * identifiers.c (alloc_node): Use XOBNEW. * init.c (cpp_create_reader): Use XCNEW. (cpp_init_builtins): Cast of b->value to enum builtin_type. (read_original_directory): Cast return value of alloca. * lex.c (add_line_note): Use XRESIZEVEC. (warn_about_normalization): Use XNEWVEC. (_cpp_lex_direct): Cast node->directive_index to (enum cpp_ttype). (new_buff): Use XNEWVEC. * line-map.c (linemap_add): Use XRESIZEVEC. * macro.c (builtin_macro): Cast return value of alloca. (paste_tokens): Likewise. (expand_arg): Use XNEWVEC and XRESIZEVEC. (_cpp_save_parameter): Use XRESIZEVEC. (create_iso_definition): Cast allocated storage to proper type. (_cpp_create_definition): Likewise. (cpp_macro_definition): Use XRESIZEVEC. * makedepend.c (add_clm): Use XNEW. (add_dir): Likewise. * mkdeps.c (munge): Use XNEWVEC. (deps_init): Use XCNEW. (deps_add_target): Use XRESIZEVEC. (deps_add_default_target): Cast return value of alloca. (deps_add_dep): Use XRESIZEVEC. (deps_add_vpath): Likewise. Use XNEWVEC too. (deps_restore): Likewise. * pch.c (save_idents): Use XNEW and XNEWVEC. (cpp_save_state): Use XNEW. (count_defs): Cast return value of htab_find. (write_defs): Likewise. (cpp_write_pch_deps): Use XNEWVEC. (collect_ht_nodes): Use XRESIZEVEC. (cpp_valid_state): Use XNEWVEC. (save_macros): Use XRESIZEVEC. Cast return value of xmemdup. * symtab.c (ht_create): Use XCNEW. (ht_lookup_with_hash): Cast return value of obstack_copy0. (ht_expand): Use XCNEWVEC. * system.h (HAVE_DESIGNATED_INITIALIZERS): False if __cplusplus. (bool): Do not define if __cplusplus. From-SVN: r100295
This commit is contained in:
Gabriel Dos Reis
Gabriel Dos Reis
parent
426357eacc
commit
c3f829c1a6
20 changed files with 405 additions and 152 deletions
|
|
@ -273,7 +273,7 @@ builtin_macro (cpp_reader *pfile, cpp_hashnode *node)
|
|||
|
||||
buf = _cpp_builtin_macro_text (pfile, node);
|
||||
len = ustrlen (buf);
|
||||
nbuf = alloca (len + 1);
|
||||
nbuf = (char *) alloca (len + 1);
|
||||
memcpy (nbuf, buf, len);
|
||||
nbuf[len]='\n';
|
||||
|
||||
|
|
@ -421,7 +421,7 @@ paste_tokens (cpp_reader *pfile, const cpp_token **plhs, const cpp_token *rhs)
|
|||
|
||||
lhs = *plhs;
|
||||
len = cpp_token_len (lhs) + cpp_token_len (rhs) + 1;
|
||||
buf = alloca (len);
|
||||
buf = (unsigned char *) alloca (len);
|
||||
end = cpp_spell_token (pfile, lhs, buf, false);
|
||||
|
||||
/* Avoid comment headers, since they are still processed in stage 3.
|
||||
|
|
@ -1001,7 +1001,7 @@ expand_arg (cpp_reader *pfile, macro_arg *arg)
|
|||
|
||||
/* Loop, reading in the arguments. */
|
||||
capacity = 256;
|
||||
arg->expanded = xmalloc (capacity * sizeof (cpp_token *));
|
||||
arg->expanded = XNEWVEC (const cpp_token *, capacity);
|
||||
|
||||
push_ptoken_context (pfile, NULL, NULL, arg->first, arg->count + 1);
|
||||
for (;;)
|
||||
|
|
@ -1011,8 +1011,8 @@ expand_arg (cpp_reader *pfile, macro_arg *arg)
|
|||
if (arg->expanded_count + 1 >= capacity)
|
||||
{
|
||||
capacity *= 2;
|
||||
arg->expanded = xrealloc (arg->expanded,
|
||||
capacity * sizeof (cpp_token *));
|
||||
arg->expanded = XRESIZEVEC (const cpp_token *, arg->expanded,
|
||||
capacity);
|
||||
}
|
||||
|
||||
token = cpp_get_token (pfile);
|
||||
|
|
@ -1272,7 +1272,8 @@ _cpp_save_parameter (cpp_reader *pfile, cpp_macro *macro, cpp_hashnode *node)
|
|||
len = macro->paramc * sizeof (union _cpp_hashnode_value);
|
||||
if (len > pfile->macro_buffer_len)
|
||||
{
|
||||
pfile->macro_buffer = xrealloc (pfile->macro_buffer, len);
|
||||
pfile->macro_buffer = XRESIZEVEC (unsigned char, pfile->macro_buffer,
|
||||
len);
|
||||
pfile->macro_buffer_len = len;
|
||||
}
|
||||
((union _cpp_hashnode_value *) pfile->macro_buffer)[macro->paramc - 1]
|
||||
|
|
@ -1419,8 +1420,9 @@ create_iso_definition (cpp_reader *pfile, cpp_macro *macro)
|
|||
/* Success. Commit or allocate the parameter array. */
|
||||
if (pfile->hash_table->alloc_subobject)
|
||||
{
|
||||
cpp_hashnode **params = pfile->hash_table->alloc_subobject
|
||||
(sizeof (cpp_hashnode *) * macro->paramc);
|
||||
cpp_hashnode **params =
|
||||
(cpp_hashnode **) pfile->hash_table->alloc_subobject
|
||||
(sizeof (cpp_hashnode *) * macro->paramc);
|
||||
memcpy (params, macro->params,
|
||||
sizeof (cpp_hashnode *) * macro->paramc);
|
||||
macro->params = params;
|
||||
|
|
@ -1532,8 +1534,9 @@ create_iso_definition (cpp_reader *pfile, cpp_macro *macro)
|
|||
/* Commit or allocate the memory. */
|
||||
if (pfile->hash_table->alloc_subobject)
|
||||
{
|
||||
cpp_token *tokns = pfile->hash_table->alloc_subobject (sizeof (cpp_token)
|
||||
* macro->count);
|
||||
cpp_token *tokns =
|
||||
(cpp_token *) pfile->hash_table->alloc_subobject (sizeof (cpp_token)
|
||||
* macro->count);
|
||||
memcpy (tokns, macro->exp.tokens, sizeof (cpp_token) * macro->count);
|
||||
macro->exp.tokens = tokns;
|
||||
}
|
||||
|
|
@ -1552,7 +1555,8 @@ _cpp_create_definition (cpp_reader *pfile, cpp_hashnode *node)
|
|||
bool ok;
|
||||
|
||||
if (pfile->hash_table->alloc_subobject)
|
||||
macro = pfile->hash_table->alloc_subobject (sizeof (cpp_macro));
|
||||
macro = (cpp_macro *) pfile->hash_table->alloc_subobject
|
||||
(sizeof (cpp_macro));
|
||||
else
|
||||
macro = (cpp_macro *) _cpp_aligned_alloc (pfile, sizeof (cpp_macro));
|
||||
macro->line = pfile->directive_line;
|
||||
|
|
@ -1722,7 +1726,8 @@ cpp_macro_definition (cpp_reader *pfile, const cpp_hashnode *node)
|
|||
|
||||
if (len > pfile->macro_buffer_len)
|
||||
{
|
||||
pfile->macro_buffer = xrealloc (pfile->macro_buffer, len);
|
||||
pfile->macro_buffer = XRESIZEVEC (unsigned char,
|
||||
pfile->macro_buffer, len);
|
||||
pfile->macro_buffer_len = len;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue