Add pcommit instruction

[deliverable/binutils-gdb.git] / gas / input-scrub.c

diff --git a/gas/input-scrub.c b/gas/input-scrub.c
index 46dd244a9814ed53de4ee7b34c4726f6f7791930..5388e8164e74022cc5e7956455a0c3a11e543927 100644 (file)
--- a/gas/input-scrub.c
+++ b/gas/input-scrub.c
@@ -1,7 +1,5 @@
 /* input_scrub.c - Break up input buffers into whole numbers of lines.
-   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-   Free Software Foundation, Inc.
+   Copyright (C) 1987-2014 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -139,7 +137,7 @@ static struct input_save *next_saved_file;
 static struct input_save *
 input_scrub_push (char *saved_position)
 {
-  register struct input_save *saved;
+  struct input_save *saved;
 
   saved = (struct input_save *) xmalloc (sizeof *saved);
 
@@ -264,6 +262,8 @@ input_scrub_include_file (char *filename, char *position)
 void
 input_scrub_include_sb (sb *from, char *position, int is_expansion)
 {
+  int newline;
+
   if (macro_nest > max_macro_nest)
     as_fatal (_("macros nested too deeply"));
   ++macro_nest;
@@ -277,9 +277,11 @@ input_scrub_include_sb (sb *from, char *position, int is_expansion)
 
   next_saved_file = input_scrub_push (position);
 
-  sb_new (&from_sb);
+  /* Allocate sufficient space: from->len + optional newline.  */
+  newline = from->len >= 1 && from->ptr[0] != '\n';
+  sb_build (&from_sb, from->len + newline);
   from_sb_is_expansion = is_expansion;
-  if (from->len >= 1 && from->ptr[0] != '\n')
+  if (newline)
     {
       /* Add the sentinel required by read.c.  */
       sb_add_char (&from_sb, '\n');
@@ -288,8 +290,7 @@ input_scrub_include_sb (sb *from, char *position, int is_expansion)
 
   /* Make sure the parser looks at defined contents when it scans for
      e.g. end-of-line at the end of a macro.  */
-  sb_add_char (&from_sb, 0);
-  from_sb.len--;
+  sb_terminate (&from_sb);
 
   sb_index = 1;
 
@@ -310,7 +311,7 @@ input_scrub_close (void)
 char *
 input_scrub_next_buffer (char **bufp)
 {
-  register char *limit;                /*->just after last char of buffer.  */
+  char *limit;         /*->just after last char of buffer.  */
 
   if (sb_index != (size_t) -1)
     {
@@ -353,7 +354,7 @@ input_scrub_next_buffer (char **bufp)
                                       + partial_size);
   if (limit)
     {
-      register char *p;                /* Find last newline.  */
+      char *p;         /* Find last newline.  */
       /* Terminate the buffer to avoid confusing TC_EOL_IN_INSN.  */
       *limit = '\0';
       for (p = limit - 1; *p != '\n' || TC_EOL_IN_INSN (p); --p)