2009-12-15 H.J. Lu <hongjiu.lu@intel.com>

	* opncls.c (bfd_opnr_iovec): Replace _XXX with XXX_P in
	parameters.

	* tekhex.c (pass_over): Replace eof with is_eof.

3 files changed, 34 insertions, 27 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e1105bb005..0b8f40579a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,19 +1,26 @@
+2009-12-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* opncls.c (bfd_opnr_iovec): Replace _XXX with XXX_P in
+	parameters.
+
+	* tekhex.c (pass_over): Replace eof with is_eof.
+
 2009-12-15  Tristan Gingold  <gingold@adacore.com>
 
-        * mach-o.h (bfd_mach_o_uuid_command): Remove section field.
-        * mach-o.c (bfd_mach_o_scan_read_uuid): Do not create a section
-        from this command.
+	* mach-o.h (bfd_mach_o_uuid_command): Remove section field.
+	* mach-o.c (bfd_mach_o_scan_read_uuid): Do not create a section
+	from this command.
 
 2009-12-15  Tristan Gingold  <gingold@adacore.com>
 
-        * mach-o.c (struct mach_o_section_name_xlat): Add flags field.
-        (dwarf_section_names_xlat): Add section flags.
-        (text_section_names_xlat): Ditto.
-        (data_section_names_xlat): Ditto.
-        (bfd_mach_o_convert_section_name_to_bfd): Now return name and section
-        flags by reference.
-        (bfd_mach_o_make_bfd_section): Use section flags when know, otherwise
-        try to guess.
+	* mach-o.c (struct mach_o_section_name_xlat): Add flags field.
+	(dwarf_section_names_xlat): Add section flags.
+	(text_section_names_xlat): Ditto.
+	(data_section_names_xlat): Ditto.
+	(bfd_mach_o_convert_section_name_to_bfd): Now return name and section
+	flags by reference.
+	(bfd_mach_o_make_bfd_section): Use section flags when know, otherwise
+	try to guess.
 
 2009-12-14  Doug Kwan  <dougkwan@google.com>
 
diff --git a/bfd/opncls.c b/bfd/opncls.c
index 520cab6b3b..8b3d2e175b 100644
--- a/bfd/opncls.c
+++ b/bfd/opncls.c
@@ -523,12 +523,12 @@ static const struct bfd_iovec opncls_iovec = {
 
 bfd *
 bfd_openr_iovec (const char *filename, const char *target,
-		 void *(*_open) (struct bfd *, void *),
+		 void *(*open_p) (struct bfd *, void *),
 		 void *open_closure,
-		 file_ptr (*_pread) (struct bfd *, void *, void *, file_ptr,
-				    file_ptr),
-		 int (*_close) (struct bfd *, void *),
-		 int (*_stat) (struct bfd *, void *, struct stat *))
+		 file_ptr (*pread_p) (struct bfd *, void *, void *,
+				      file_ptr, file_ptr),
+		 int (*close_p) (struct bfd *, void *),
+		 int (*stat_p) (struct bfd *, void *, struct stat *))
 {
   bfd *nbfd;
   const bfd_target *target_vec;
@@ -549,8 +549,8 @@ bfd_openr_iovec (const char *filename, const char *target,
   nbfd->filename = filename;
   nbfd->direction = read_direction;
 
-  /* `open (...)' would get expanded by an the open(2) syscall macro.  */
-  stream = (*_open) (nbfd, open_closure);
+  /* `open_p (...)' would get expanded by an the open(2) syscall macro.  */
+  stream = (*open_p) (nbfd, open_closure);
   if (stream == NULL)
     {
       _bfd_delete_bfd (nbfd);
@@ -559,9 +559,9 @@ bfd_openr_iovec (const char *filename, const char *target,
 
   vec = (struct opncls *) bfd_zalloc (nbfd, sizeof (struct opncls));
   vec->stream = stream;
-  vec->pread = _pread;
-  vec->close = _close;
-  vec->stat = _stat;
+  vec->pread = pread_p;
+  vec->close = close_p;
+  vec->stat = stat_p;
 
   nbfd->iovec = &opncls_iovec;
   nbfd->iostream = vec;
diff --git a/bfd/tekhex.c b/bfd/tekhex.c
index bc3c9ca9bc..2204ebba6e 100644
--- a/bfd/tekhex.c
+++ b/bfd/tekhex.c
@@ -461,22 +461,22 @@ static bfd_boolean
 pass_over (bfd *abfd, bfd_boolean (*func) (bfd *, int, char *))
 {
   unsigned int chars_on_line;
-  bfd_boolean eof = FALSE;
+  bfd_boolean is_eof = FALSE;
 
   /* To the front of the file.  */
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
     return FALSE;
-  while (! eof)
+  while (! is_eof)
     {
       char src[MAXCHUNK];
       char type;
 
       /* Find first '%'.  */
-      eof = (bfd_boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1);
-      while (*src != '%' && !eof)
-	eof = (bfd_boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1);
+      is_eof = (bfd_boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1);
+      while (*src != '%' && !is_eof)
+	is_eof = (bfd_boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1);
 
-      if (eof)
+      if (is_eof)
 	break;
 
       /* Fetch the type and the length and the checksum.  */