FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from gcc

Browse source
This commit is contained in:
DJ Delorie 2004-11-24 03:00:34 +00:00
parent b34bf369e7
commit eb129e357a
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libiberty/ChangeLog
View file

@ -1,3 +1,12 @@
2004-11-23 Ian Lance Taylor <ian@wasabisystems.com>
PR other/18623
* cp-demangle.c (d_call_offset): Remove useless local variables
offset and virtual_offset.
* cplus-dem.c (ada_demangle): Remove useless local variable
at_start_name.
(demangle_template): Remove useless local variable start.
2004-11-19 Roger Sayle <roger@eyesopen.com> 2004-11-19 Roger Sayle <roger@eyesopen.com>
* objalloc.c, strsignal.c, xstrerror.c: Include "config.h" before * objalloc.c, strsignal.c, xstrerror.c: Include "config.h" before

9
libiberty/cp-demangle.c
View file

@ -1633,20 +1633,17 @@ d_call_offset (di, c)
struct d_info *di; struct d_info *di;
int c; int c;
{ {
long offset;
long virtual_offset;
if (c == '\0') if (c == '\0')
c = d_next_char (di); c = d_next_char (di);
if (c == 'h') if (c == 'h')
offset = d_number (di); d_number (di);
else if (c == 'v') else if (c == 'v')
{ {
offset = d_number (di); d_number (di);
if (d_next_char (di) != '_') if (d_next_char (di) != '_')
return 0; return 0;
virtual_offset = d_number (di); d_number (di);
} }
else else
return 0; return 0;

8
libiberty/cplus-dem.c
View file

@ -976,7 +976,6 @@ ada_demangle (mangled, option)
int len0; int len0;
const char* p; const char* p;
char *demangled = NULL; char *demangled = NULL;
int at_start_name;
int changed; int changed;
size_t demangled_size = 0; size_t demangled_size = 0;
@ -1029,15 +1028,12 @@ ada_demangle (mangled, option)
i += 1, j += 1) i += 1, j += 1)
demangled[j] = mangled[i]; demangled[j] = mangled[i];
at_start_name = 1;
while (i < len0) while (i < len0)
{ {
at_start_name = 0;
if (i < len0 - 2 && mangled[i] == '_' && mangled[i + 1] == '_') if (i < len0 - 2 && mangled[i] == '_' && mangled[i + 1] == '_')
{ {
demangled[j] = '.'; demangled[j] = '.';
changed = at_start_name = 1; changed = 1;
i += 2; j += 1; i += 2; j += 1;
} }
else else
@ -2040,14 +2036,12 @@ demangle_template (work, mangled, tname, trawname, is_type, remember)
int r; int r;
int need_comma = 0; int need_comma = 0;
int success = 0; int success = 0;
const char *start;
int is_java_array = 0; int is_java_array = 0;
string temp; string temp;
(*mangled)++; (*mangled)++;
if (is_type) if (is_type)
{ {
start = *mangled;
/* get template name */ /* get template name */
if (**mangled == 'z') if (**mangled == 'z')
{ {