[PATCH] converted irix-core.c to ISO C

[PATCH] converted irix-core.c to ISO C

[Joel Brobecker]

[-- Attachment #1: Type: text/plain, Size: 450 bytes --]

I applied the following change as obvious.

2005-03-28  Joel Brobecker  <brobecker@adacore.com>

        * irix-core.c: Convert to ISO C.

Tested by rebuilding bfd. No warning.

There was one formatting question I had regarding the prototypes,
though:

        static const bfd_target *irix_core_core_file_p
          (bfd *);

Should the "(bfd *);" part be joined with the previous line if the entire
declaration fits in one line?

Thanks,
-- 
Joel

[-- Attachment #2: irix-core.c.diff --]
[-- Type: text/plain, Size: 3381 bytes --]

Index: irix-core.c
===================================================================
RCS file: /cvs/src/src/bfd/irix-core.c,v
retrieving revision 1.13
diff -u -p -r1.13 irix-core.c
--- irix-core.c	29 Mar 2005 04:19:34 -0000	1.13
+++ irix-core.c	29 Mar 2005 04:44:16 -0000
@@ -42,32 +42,30 @@ struct sgi_core_struct
 #define core_command(bfd) (core_hdr(bfd)->cmd)
 
 static asection *make_bfd_asection
-  PARAMS ((bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr));
+  (bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr);
 static const bfd_target *irix_core_core_file_p
-  PARAMS ((bfd *));
+  (bfd *);
 static char *irix_core_core_file_failing_command
-  PARAMS ((bfd *));
+  (bfd *);
 static int irix_core_core_file_failing_signal
-  PARAMS ((bfd *));
+  (bfd *);
 static bfd_boolean irix_core_core_file_matches_executable_p
-  PARAMS ((bfd *, bfd *));
+  (bfd *, bfd *);
 static void swap_abort
-  PARAMS ((void));
+  (void);
 #ifdef CORE_MAGIC64
 static int do_sections64
-  PARAMS ((bfd *, struct coreout *));
+  (bfd *, struct coreout *);
 #endif
 static int do_sections
-  PARAMS ((bfd *, struct coreout *));
+  (bfd *, struct coreout *);
 
 /* Helper function for irix_core_core_file_p:
    32-bit and 64-bit versions.  */
 
 #ifdef CORE_MAGIC64
 static int
-do_sections64 (abfd, coreout)
-     bfd * abfd;
-     struct coreout * coreout;
+do_sections64 (bfd *abfd, struct coreout *coreout)
 {
   struct vmap64 vmap;
   char *secname;
@@ -115,9 +113,7 @@ do_sections64 (abfd, coreout)
 /* 32-bit version.  */
 
 static int
-do_sections (abfd, coreout)
-     bfd * abfd;
-     struct coreout *coreout;
+do_sections (bfd *abfd, struct coreout *coreout)
 {
   struct vmap vmap;
   char *secname;
@@ -161,13 +157,12 @@ do_sections (abfd, coreout)
 }
 
 static asection *
-make_bfd_asection (abfd, name, flags, size, vma, filepos)
-     bfd *abfd;
-     const char *name;
-     flagword flags;
-     bfd_size_type size;
-     bfd_vma vma;
-     file_ptr filepos;
+make_bfd_asection (bfd *abfd,
+                   const char *name,
+                   flagword flags,
+                   bfd_size_type size,
+                   bfd_vma vma,
+                   file_ptr filepos)
 {
   asection *asect;
 
@@ -185,8 +180,7 @@ make_bfd_asection (abfd, name, flags, si
 }
 
 static const bfd_target *
-irix_core_core_file_p (abfd)
-     bfd *abfd;
+irix_core_core_file_p (bfd *abfd)
 {
   int val;
   struct coreout coreout;
@@ -273,30 +267,27 @@ irix_core_core_file_p (abfd)
 }
 
 static char *
-irix_core_core_file_failing_command (abfd)
-     bfd *abfd;
+irix_core_core_file_failing_command (bfd *abfd)
 {
   return core_command (abfd);
 }
 
 static int
-irix_core_core_file_failing_signal (abfd)
-     bfd *abfd;
+irix_core_core_file_failing_signal (bfd *abfd)
 {
   return core_signal (abfd);
 }
 
 static bfd_boolean
-irix_core_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd ATTRIBUTE_UNUSED;
-     bfd *exec_bfd ATTRIBUTE_UNUSED;
+irix_core_core_file_matches_executable_p (bfd *core_bfd ATTRIBUTE_UNUSED,
+                                          bfd *exec_bfd ATTRIBUTE_UNUSED)
 {
   return TRUE;			/* XXX - FIXME */
 }
 
 /* If somebody calls any byte-swapping routines, shoot them.  */
 static void
-swap_abort()
+swap_abort(void)
 {
   abort(); /* This way doesn't require any declaration for ANSI to fuck up */
 }

Re: [PATCH] converted irix-core.c to ISO C

[Eric Christopher]

> There was one formatting question I had regarding the prototypes,
> though:
> 
>         static const bfd_target *irix_core_core_file_p
>           (bfd *);
> 
> Should the "(bfd *);" part be joined with the previous line if the entire
> declaration fits in one line?

Yes please.

-eric

Re: [PATCH] converted irix-core.c to ISO C

[Alan Modra]

On Mon, Mar 28, 2005 at 09:11:35PM -0800, Joel Brobecker wrote:
> There was one formatting question I had regarding the prototypes,
> though:
> 
>         static const bfd_target *irix_core_core_file_p
>           (bfd *);
> 
> Should the "(bfd *);" part be joined with the previous line if the entire
> declaration fits in one line?

I don't think it matters.  Hmm, most of those prototypes can be deleted,
since you only need forward declarations now.

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre

Re: [PATCH] converted irix-core.c to ISO C

[Joel Brobecker]

[-- Attachment #1: Type: text/plain, Size: 758 bytes --]

> > Should the "(bfd *);" part be joined with the previous line if the entire
> > declaration fits in one line?
> 
> I don't think it matters.  Hmm, most of those prototypes can be deleted,
> since you only need forward declarations now.

How does the attached patch look? It compiles without warnings on
mips-irix, and I made sure that are not ifdef'ed function that I might
have missed.

2005-03-28  Joel Brobecker  <brobecker@gnat.com>

        * irix-core.c: Remove some unnecessary prototypes.

Is there a difference between forward declarations and prototypes?
All the litterature I've read (which is not authoritative) say they
are the same thing. In my case, I wonder if I should put the parameter
names in the forward declaration.

Thanks,
-- 
Joel

[-- Attachment #2: irix-core.c.diff --]
[-- Type: text/plain, Size: 997 bytes --]

Index: irix-core.c
===================================================================
RCS file: /cvs/src/src/bfd/irix-core.c,v
retrieving revision 1.14
diff -u -p -r1.14 irix-core.c
--- irix-core.c	29 Mar 2005 04:48:45 -0000	1.14
+++ irix-core.c	29 Mar 2005 06:35:20 -0000
@@ -43,22 +43,9 @@ struct sgi_core_struct
 
 static asection *make_bfd_asection
   (bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr);
-static const bfd_target *irix_core_core_file_p
-  (bfd *);
-static char *irix_core_core_file_failing_command
-  (bfd *);
-static int irix_core_core_file_failing_signal
-  (bfd *);
-static bfd_boolean irix_core_core_file_matches_executable_p
-  (bfd *, bfd *);
-static void swap_abort
-  (void);
 #ifdef CORE_MAGIC64
-static int do_sections64
-  (bfd *, struct coreout *);
+static int do_sections64 (bfd *, struct coreout *);
 #endif
-static int do_sections
-  (bfd *, struct coreout *);
 
 /* Helper function for irix_core_core_file_p:
    32-bit and 64-bit versions.  */

Re: [PATCH] converted irix-core.c to ISO C

[Alan Modra]

On Mon, Mar 28, 2005 at 10:41:54PM -0800, Joel Brobecker wrote:
> Is there a difference between forward declarations and prototypes?
> All the litterature I've read (which is not authoritative) say they
> are the same thing. In my case, I wonder if I should put the parameter
> names in the forward declaration.

ISO C function definitions serve as prototypes, so the only need for
separate prototypes is where a function is referenced before its
definition.  That's what I meant by "only need forward declarations
now".

> +static int do_sections64 (bfd *, struct coreout *);

This one can go too.  OK with that change.

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre

Re: [PATCH] converted irix-core.c to ISO C

[Joel Brobecker]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

> > +static int do_sections64 (bfd *, struct coreout *);
> 
> This one can go too.  OK with that change.

Good catch. I don't know why I thought it was needed.

Here is what I ended up cheking in:

2005-03-29  Joel Brobecker  <brobecker@gnat.com>

        * irix-core.c: Remove some unnecessary prototypes.

Thanks,
-- 
Joel

[-- Attachment #2: irix-core.c.diff --]
[-- Type: text/plain, Size: 944 bytes --]

Index: irix-core.c
===================================================================
RCS file: /cvs/src/src/bfd/irix-core.c,v
retrieving revision 1.14
diff -u -p -r1.14 irix-core.c
--- irix-core.c	29 Mar 2005 04:48:45 -0000	1.14
+++ irix-core.c	29 Mar 2005 08:33:00 -0000
@@ -43,22 +43,6 @@ struct sgi_core_struct
 
 static asection *make_bfd_asection
   (bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr);
-static const bfd_target *irix_core_core_file_p
-  (bfd *);
-static char *irix_core_core_file_failing_command
-  (bfd *);
-static int irix_core_core_file_failing_signal
-  (bfd *);
-static bfd_boolean irix_core_core_file_matches_executable_p
-  (bfd *, bfd *);
-static void swap_abort
-  (void);
-#ifdef CORE_MAGIC64
-static int do_sections64
-  (bfd *, struct coreout *);
-#endif
-static int do_sections
-  (bfd *, struct coreout *);
 
 /* Helper function for irix_core_core_file_p:
    32-bit and 64-bit versions.  */