From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28919 invoked by alias); 25 Nov 2003 01:46:10 -0000 Mailing-List: contact insight-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: insight-owner@sources.redhat.com Received: (qmail 28899 invoked from network); 25 Nov 2003 01:46:08 -0000 Received: from unknown (HELO hawaii.kealia.com) (209.3.10.89) by sources.redhat.com with SMTP; 25 Nov 2003 01:46:08 -0000 Received: by hawaii.kealia.com (Postfix, from userid 2049) id D30DFC6B6; Mon, 24 Nov 2003 17:46:07 -0800 (PST) To: insight@sources.redhat.com Subject: [patch] STREQ fallout From: David Carlton Date: Tue, 25 Nov 2003 01:46:00 -0000 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2003-q4/txt/msg00089.txt.bz2 Here's a patch dealing with fallout from Andrew's latest deprecation; it gets rid of uses of STREQ{,N} and, as a bonus, gets rid of a couple of DEPRECATED_SYMBOL_NAMEs that I happened to notice where it's obvious that the linkage name is what is intended. David Carlton carlton@kealia.com 2003-11-24 David Carlton * generic/gdbtk.c (target_is_native): Replace STREQ by strcmp. * generic/gdbtk-cmds.c (gdb_stop): Replace STREQ by strcmp. (gdb_search): Replace STREQN by strncmp and DEPRECATED_SYMBOL_NAME by SYMBOL_LINKAGE_NAME. * generic/gdbtk-varobj.c (variable_format): Replace STREQN by strncmp. Index: gdbtk/generic/gdbtk-cmds.c =================================================================== RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-cmds.c,v retrieving revision 1.77 diff -u -p -r1.77 gdbtk-cmds.c --- gdbtk/generic/gdbtk-cmds.c 8 Sep 2003 19:27:48 -0000 1.77 +++ gdbtk/generic/gdbtk-cmds.c 25 Nov 2003 01:39:31 -0000 @@ -547,7 +547,7 @@ gdb_stop (ClientData clientData, Tcl_Int if (objc > 1) { s = Tcl_GetStringFromObj (objv[1], NULL); - if (STREQ (s, "detach")) + if (strcmp (s, "detach") == 0) force = 1; } @@ -1365,8 +1365,9 @@ gdb_search (ClientData clientData, Tcl_I /* Strip off some C++ special symbols, like RTTI and global constructors/destructors. */ - if ((p->symbol != NULL && !STREQN (DEPRECATED_SYMBOL_NAME (p->symbol), "__tf", 4) - && !STREQN (DEPRECATED_SYMBOL_NAME (p->symbol), "_GLOBAL_", 8)) + if ((p->symbol != NULL + && strncmp (SYMBOL_LINKAGE_NAME (p->symbol), "__tf", 4) != 0 + && strncmp (SYMBOL_LINKAGE_NAME (p->symbol), "_GLOBAL_", 8) != 0) || p->msymbol != NULL) { elem = Tcl_NewListObj (0, NULL); Index: gdbtk/generic/gdbtk-varobj.c =================================================================== RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-varobj.c,v retrieving revision 1.16 diff -u -p -r1.16 gdbtk-varobj.c --- gdbtk/generic/gdbtk-varobj.c 11 Feb 2003 16:08:38 -0000 1.16 +++ gdbtk/generic/gdbtk-varobj.c 25 Nov 2003 01:39:31 -0000 @@ -474,15 +474,15 @@ variable_format (Tcl_Interp *interp, int /* Set the format of VAR to given format */ int len; char *fmt = Tcl_GetStringFromObj (objv[2], &len); - if (STREQN (fmt, "natural", len)) + if (strncmp (fmt, "natural", len) == 0) varobj_set_display_format (var, FORMAT_NATURAL); - else if (STREQN (fmt, "binary", len)) + else if (strncmp (fmt, "binary", len) == 0) varobj_set_display_format (var, FORMAT_BINARY); - else if (STREQN (fmt, "decimal", len)) + else if (strncmp (fmt, "decimal", len) == 0) varobj_set_display_format (var, FORMAT_DECIMAL); - else if (STREQN (fmt, "hexadecimal", len)) + else if (strncmp (fmt, "hexadecimal", len) == 0) varobj_set_display_format (var, FORMAT_HEXADECIMAL); - else if (STREQN (fmt, "octal", len)) + else if (strncmp (fmt, "octal", len) == 0) varobj_set_display_format (var, FORMAT_OCTAL); else { Index: gdbtk/generic/gdbtk.c =================================================================== RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk.c,v retrieving revision 1.37 diff -u -p -r1.37 gdbtk.c --- gdbtk/generic/gdbtk.c 4 Aug 2003 17:08:23 -0000 1.37 +++ gdbtk/generic/gdbtk.c 25 Nov 2003 01:39:31 -0000 @@ -321,10 +321,11 @@ target_is_native (struct target_ops *t) { char *name = t->to_shortname; - if (STREQ (name, "exec") || STREQ (name, "hpux-threads") - || STREQ (name, "child") || STREQ (name, "procfs") - || STREQ (name, "solaris-threads") || STREQ (name, "linuxthreads") - || STREQ (name, "multi-thread")) + if (strcmp (name, "exec") == 0 || strcmp (name, "hpux-threads") == 0 + || strcmp (name, "child") == 0 || strcmp (name, "procfs") == 0 + || strcmp (name, "solaris-threads") == 0 + || strcmp (name, "linuxthreads") == 0 + || strcmp (name, "multi-thread") == 0) return 1; return 0;