/* listing.c - maintain assembly listings
- Copyright (C) 1991-2016 Free Software Foundation, Inc.
+ Copyright (C) 1991-2017 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
{
if (listing_tail != (list_info_type *) NULL)
{
- unsigned int l = strlen (name) + strlen (message) + 1;
- char *n = (char *) xmalloc (l);
+ char *n = concat (name, message, (char *) NULL);
struct list_message *lm = XNEW (struct list_message);
- strcpy (n, name);
- strcat (n, message);
lm->message = n;
lm->next = NULL;
}
/* Make new entry. */
- p = (file_info_type *) xmalloc (sizeof (file_info_type));
+ p = XNEW (file_info_type);
p->next = file_info_head;
file_info_head = p;
p->filename = xstrdup (file_name);
&& !(last_file && file && filename_cmp (file, last_file)))
return;
- new_i = (list_info_type *) xmalloc (sizeof (list_info_type));
+ new_i = XNEW (list_info_type);
/* Detect if we are reading from stdin by examining the file
name returned by as_where().
if (strcmp (file, _("{standard input}")) == 0
&& input_line_pointer != NULL)
{
- char *copy;
+ char *copy, *src, *dest;
int len;
int seen_quote = 0;
int seen_slash = 0;
len = copy - input_line_pointer + 1;
- copy = (char *) xmalloc (len);
+ copy = XNEWVEC (char, len);
- if (copy != NULL)
- {
- char *src = input_line_pointer;
- char *dest = copy;
-
- while (--len)
- {
- unsigned char c = *src++;
+ src = input_line_pointer;
+ dest = copy;
- /* Omit control characters in the listing. */
- if (!ISCNTRL (c))
- *dest++ = c;
- }
+ while (--len)
+ {
+ unsigned char c = *src++;
- *dest = 0;
+ /* Omit control characters in the listing. */
+ if (!ISCNTRL (c))
+ *dest++ = c;
}
+ *dest = 0;
+
new_i->line_contents = copy;
}
else
}
else
{
- new_i = (list_info_type *) xmalloc (sizeof (list_info_type));
+ new_i = XNEW (list_info_type);
new_i->line_contents = ps;
}
int show_listing = 1;
unsigned int width;
- buffer = (char *) xmalloc (listing_rhs_width);
- data_buffer = (char *) xmalloc (MAX_BYTES);
+ buffer = XNEWVEC (char, listing_rhs_width);
+ data_buffer = XNEWVEC (char, MAX_BYTES);
eject = 1;
list = head->next;
if (listing)
{
length = input_line_pointer - start;
- ttl = (char *) xmalloc (length + 1);
- memcpy (ttl, start, length);
- ttl[length] = 0;
+ ttl = xmemdup0 (start, length);
listing_tail->edict = depth ? EDICT_SBTTL : EDICT_TITLE;
listing_tail->edict_arg = ttl;
}