From 27bfe10e379921e1e925405b00c64900268f5061 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Sat, 13 Dec 2003 22:29:06 +0000 Subject: [PATCH] * dwarf2read.c (dwarf2_add_member_fn, read_structure_scope): Replace uses of DEPRECATED_STREQ and DEPRECATED_STREQN with calls to strcmp and strncmp. --- gdb/ChangeLog | 4 ++++ gdb/dwarf2read.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dd15edc..179bffb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2003-12-13 Jim Blandy + * dwarf2read.c (dwarf2_add_member_fn, read_structure_scope): + Replace uses of DEPRECATED_STREQ and DEPRECATED_STREQN with calls + to strcmp and strncmp. + * osabi.c (gdbarch_init_osabi): Reformat error message with better line breaks. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index b151d60..bf2a57e 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -2604,7 +2604,7 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die, /* Look up member function name in fieldlist. */ for (i = 0; i < fip->nfnfields; i++) { - if (DEPRECATED_STREQ (fip->fnfieldlists[i].name, fieldname)) + if (strcmp (fip->fnfieldlists[i].name, fieldname) == 0) break; } @@ -2883,7 +2883,9 @@ read_structure_scope (struct die_info *die, struct dwarf2_cu *cu) { char *fieldname = TYPE_FIELD_NAME (t, i); - if (DEPRECATED_STREQN (fieldname, vptr_name, strlen (vptr_name) - 1) + if ((strncmp (fieldname, vptr_name, + strlen (vptr_name) - 1) + == 0) && is_cplus_marker (fieldname[strlen (vptr_name)])) { TYPE_VPTR_FIELDNO (type) = i; -- 2.7.4