2003-02-06 Andrew Cagney <ac131313@redhat.com>

	* linux-proc.c: Include "gdb_stat.h" instead of <sys/stat.h>.
	* cp-valprint.c (cp_print_value_fields): Eliminate STREQN.
	* jv-typeprint.c (java_type_print_base): Ditto.
	* typeprint.c (typedef_print): Eliminate STREQ.
	* cli/cli-script.c (define_command, define_command): Ditto.
	* main.c (captured_main): Ditto.
	* values.c (lookup_internalvar): Ditto.
	* utils.c (safe_strerror, parse_escape): Eliminate assignment
	within `if' conditional.
	* linespec.c (decode_line_2): Ditto.
	* cli/cli-dump.c (bfd_openr_with_cleanup): Ditto.
	(bfd_openw_with_cleanup): Ditto.

Index: mi/ChangeLog
2003-02-06  Andrew Cagney  <ac131313@redhat.com>

	* mi-cmd-env.c: Include "gdb_stat.h" instead of <sys/stat.h>.

13 files changed, 47 insertions, 23 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6ec49eafb89..5721310378a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2003-02-06  Andrew Cagney  <ac131313@redhat.com>
+
+	* linux-proc.c: Include "gdb_stat.h" instead of <sys/stat.h>.
+	* cp-valprint.c (cp_print_value_fields): Eliminate STREQN.
+	* jv-typeprint.c (java_type_print_base): Ditto.
+	* typeprint.c (typedef_print): Eliminate STREQ.
+	* cli/cli-script.c (define_command, define_command): Ditto.
+	* main.c (captured_main): Ditto.
+	* values.c (lookup_internalvar): Ditto.
+	* utils.c (safe_strerror, parse_escape): Eliminate assignment
+	within `if' conditional.
+	* linespec.c (decode_line_2): Ditto.
+	* cli/cli-dump.c (bfd_openr_with_cleanup): Ditto.
+	(bfd_openw_with_cleanup): Ditto.
+
 2003-02-07  Mark Kettenis  <kettenis@gnu.org>
 
 	* x86-64-tdep.c (x86_64_init_abi): Set extract_return_value to
diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
index 7a58fcbbd7b..6bd40e033b1 100644
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -132,7 +132,8 @@ bfd_openr_with_cleanup (const char *filename, const char *target)
 {
   bfd *ibfd;
 
-  if ((ibfd = bfd_openr (filename, target)) == NULL)
+  ibfd = bfd_openr (filename, target);
+  if (ibfd == NULL)
     error ("Failed to open %s: %s.", filename, 
 	   bfd_errmsg (bfd_get_error ()));
 
@@ -150,7 +151,8 @@ bfd_openw_with_cleanup (char *filename, const char *target, char *mode)
 
   if (*mode == 'w')	/* Write: create new file */
     {
-      if ((obfd = bfd_openw (filename, target)) == NULL)
+      obfd = bfd_openw (filename, target);
+      if (obfd == NULL)
 	error ("Failed to open %s: %s.", filename, 
 	       bfd_errmsg (bfd_get_error ()));
       make_cleanup_bfd_close (obfd);
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index 6b7bec68e4a..d68c365959d 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -1093,7 +1093,7 @@ define_command (char *comname, int from_tty)
 
   /* Look it up, and verify that we got an exact match.  */
   c = lookup_cmd (&tem, cmdlist, "", -1, 1);
-  if (c && !STREQ (comname, c->name))
+  if (c && strcmp (comname, c->name) != 0)
     c = 0;
 
   if (c)
@@ -1126,7 +1126,7 @@ define_command (char *comname, int from_tty)
       /* Look up cmd it hooks, and verify that we got an exact match.  */
       tem = comname + hook_name_size;
       hookc = lookup_cmd (&tem, cmdlist, "", -1, 0);
-      if (hookc && !STREQ (comname + hook_name_size, hookc->name))
+      if (hookc && strcmp (comname + hook_name_size, hookc->name) != 0)
 	hookc = 0;
       if (!hookc)
 	{
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index a2ccbdbf77c..a260144d04f 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -260,8 +260,8 @@ cp_print_value_fields (struct type *type, struct type *real_type, char *valaddr,
   if ((len == n_baseclasses)
       || ((len - n_baseclasses == 1)
 	  && TYPE_HAS_VTABLE (type)
-	  && STREQN (TYPE_FIELD_NAME (type, n_baseclasses),
-		     hpacc_vtbl_ptr_name, 5))
+	  && strncmp (TYPE_FIELD_NAME (type, n_baseclasses),
+		      hpacc_vtbl_ptr_name, 5) == 0)
       || !len)
     fprintf_filtered (stream, "<No data fields>");
   else
@@ -285,7 +285,8 @@ cp_print_value_fields (struct type *type, struct type *real_type, char *valaddr,
 
 	  /* If a vtable pointer appears, we'll print it out later */
 	  if (TYPE_HAS_VTABLE (type)
-	      && STREQN (TYPE_FIELD_NAME (type, i), hpacc_vtbl_ptr_name, 5))
+	      && strncmp (TYPE_FIELD_NAME (type, i), hpacc_vtbl_ptr_name,
+			  5) == 0)
 	    continue;
 
 	  if (fields_seen)
@@ -408,9 +409,8 @@ cp_print_value_fields (struct type *type, struct type *real_type, char *valaddr,
     }				/* if there are data fields */
   /* Now print out the virtual table pointer if there is one */
   if (TYPE_HAS_VTABLE (type)
-      && STREQN (TYPE_FIELD_NAME (type, n_baseclasses),
-		 hpacc_vtbl_ptr_name, 
-		 5))
+      && strncmp (TYPE_FIELD_NAME (type, n_baseclasses),
+		  hpacc_vtbl_ptr_name, 5) == 0)
     {
       struct value *v;
       /* First get the virtual table pointer and print it out */
diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index b6dac57d48c..0d4c1876486 100644
--- a/gdb/jv-typeprint.c
+++ b/gdb/jv-typeprint.c
@@ -166,12 +166,12 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
 	    {
 	      QUIT;
 	      /* Don't print out virtual function table.  */
-	      if (STREQN (TYPE_FIELD_NAME (type, i), "_vptr", 5)
+	      if (strncmp (TYPE_FIELD_NAME (type, i), "_vptr", 5) == 0
 		  && is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
 		continue;
 
 	      /* Don't print the dummy field "class". */
-	      if (STREQN (TYPE_FIELD_NAME (type, i), "class", 5))
+	      if (strncmp (TYPE_FIELD_NAME (type, i), "class", 5) == 0)
 		continue;
 
 	      print_spaces_filtered (level + 4, stream);
diff --git a/gdb/linespec.c b/gdb/linespec.c
index 4b36d864c25..4c0e3c12753 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -438,7 +438,8 @@ decode_line_2 (struct symbol *sym_arr[], int nelts, int funfirstline,
       i++;
     }
 
-  if ((prompt = getenv ("PS2")) == NULL)
+  prompt = getenv ("PS2");
+  if (prompt == NULL)
     {
       prompt = "> ";
     }
diff --git a/gdb/linux-proc.c b/gdb/linux-proc.c
index 2f43ae61f97..00383e9a6ee 100644
--- a/gdb/linux-proc.c
+++ b/gdb/linux-proc.c
@@ -23,7 +23,7 @@
 #include "inferior.h"
 #include <sys/param.h>	/* for MAXPATHLEN */
 #include <sys/procfs.h>	/* for elf_gregset etc. */
-#include <sys/stat.h>	/* for struct stat */
+#include "gdb_stat.h"	/* for struct stat */
 #include <ctype.h>	/* for isdigit */
 #include <unistd.h>	/* for open, pread64 */
 #include <fcntl.h>	/* for O_RDONLY */
diff --git a/gdb/main.c b/gdb/main.c
index 73c17f573cc..b10277bb7ee 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -638,7 +638,7 @@ extern int gdbtk_test (char *);
 
   if (execarg != NULL
       && symarg != NULL
-      && STREQ (execarg, symarg))
+      && strcmp (execarg, symarg) == 0)
     {
       /* The exec file and the symbol-file are the same.  If we can't
          open it, better only print one error message.
diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog
index e79398c15a7..93b55d7dd9b 100644
--- a/gdb/mi/ChangeLog
+++ b/gdb/mi/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-06  Andrew Cagney  <ac131313@redhat.com>
+
+	* mi-cmd-env.c: Include "gdb_stat.h" instead of <sys/stat.h>.
+
 2003-02-04  Jim Ingham <jingham@apple.com>
 	    Keith Seitz  <keiths@redhat.com>
             Elena Zannoni  <ezannoni@redhat.com>
diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c
index 8fc673fe59b..55fcba10c9d 100644
--- a/gdb/mi/mi-cmd-env.c
+++ b/gdb/mi/mi-cmd-env.c
@@ -35,7 +35,7 @@
 #include "top.h"
 
 #include "gdb_string.h"
-#include <sys/stat.h>
+#include "gdb_stat.h"
 
 static void env_cli_command (const char *cli, char *args);
 static void env_mod_path (char *dirname, char **which_path);
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 8e517a06599..b18410322a9 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -67,15 +67,15 @@ typedef_print (struct type *type, struct symbol *new, struct ui_file *stream)
       fprintf_filtered (stream, "typedef ");
       type_print (type, "", stream, 0);
       if (TYPE_NAME ((SYMBOL_TYPE (new))) == 0
-	  || !STREQ (TYPE_NAME ((SYMBOL_TYPE (new))), SYMBOL_NAME (new)))
+	  || strcmp (TYPE_NAME ((SYMBOL_TYPE (new))), SYMBOL_NAME (new)) != 0)
 	fprintf_filtered (stream, " %s", SYMBOL_SOURCE_NAME (new));
       break;
 #endif
 #ifdef _LANG_m2
     case language_m2:
       fprintf_filtered (stream, "TYPE ");
-      if (!TYPE_NAME (SYMBOL_TYPE (new)) ||
-	  !STREQ (TYPE_NAME (SYMBOL_TYPE (new)), SYMBOL_NAME (new)))
+      if (!TYPE_NAME (SYMBOL_TYPE (new))
+	  || strcmp (TYPE_NAME ((SYMBOL_TYPE (new))), SYMBOL_NAME (new)) != 0)
 	fprintf_filtered (stream, "%s = ", SYMBOL_SOURCE_NAME (new));
       else
 	fprintf_filtered (stream, "<builtin> = ");
diff --git a/gdb/utils.c b/gdb/utils.c
index 6d9e42906eb..0d9fb318a96 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -831,7 +831,8 @@ safe_strerror (int errnum)
   char *msg;
   static char buf[32];
 
-  if ((msg = strerror (errnum)) == NULL)
+  msg = strerror (errnum);
+  if (msg == NULL)
     {
       sprintf (buf, "(undocumented errno %d)", errnum);
       msg = buf;
@@ -1447,14 +1448,15 @@ parse_escape (char **string_ptr)
 	  register int count = 0;
 	  while (++count < 3)
 	    {
-	      if ((c = *(*string_ptr)++) >= '0' && c <= '7')
+	      c = (**string_ptr);
+	      if (c >= '0' && c <= '7')
 		{
+		  (*string_ptr)++;
 		  i *= 8;
 		  i += c - '0';
 		}
 	      else
 		{
-		  (*string_ptr)--;
 		  break;
 		}
 	    }
diff --git a/gdb/values.c b/gdb/values.c
index 0ce7dfdccd6..2dfaee9aad6 100644
--- a/gdb/values.c
+++ b/gdb/values.c
@@ -406,7 +406,7 @@ lookup_internalvar (char *name)
   register struct internalvar *var;
 
   for (var = internalvars; var; var = var->next)
-    if (STREQ (var->name, name))
+    if (strcmp (var->name, name) == 0)
       return var;
 
   var = (struct internalvar *) xmalloc (sizeof (struct internalvar));