outelf*: remove null debug functions

Instead of duplicating empty functions, use the corresponding
null_debug_* functions.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

3 files changed, 15 insertions, 69 deletions

diff --git a/output/outelf32.c b/output/outelf32.c
index f86106df..3ab8590d 100644
--- a/output/outelf32.c
+++ b/output/outelf32.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 1996-2013 The NASM Authors - All Rights Reserved
+ *   Copyright 1996-2016 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
  *
@@ -159,8 +159,6 @@ static struct elf_symbol *lastsym;
 
 /* common debugging routines */
 static void debug32_typevalue(int32_t);
-static void debug32_deflabel(char *, int32_t, int64_t, int, char *);
-static void debug32_directive(const char *, const char *);
 
 /* stabs debugging routines */
 static void stabs32_linenum(const char *filename, int32_t linenumber, int32_t);
@@ -1341,8 +1339,8 @@ static struct dfmt df_dwarf = {
     "dwarf",
     dwarf32_init,
     dwarf32_linenum,
-    debug32_deflabel,
-    debug32_directive,
+    null_debug_deflabel,
+    null_debug_directive,
     debug32_typevalue,
     dwarf32_output,
     dwarf32_cleanup
@@ -1352,8 +1350,8 @@ static struct dfmt df_stabs = {
     "stabs",
     null_debug_init,
     stabs32_linenum,
-    debug32_deflabel,
-    debug32_directive,
+    null_debug_deflabel,
+    null_debug_directive,
     debug32_typevalue,
     stabs32_output,
     stabs32_cleanup
@@ -1409,22 +1407,6 @@ static void stabs32_linenum(const char *filename, int32_t linenumber,
     currentline = linenumber;
 }
 
-static void debug32_deflabel(char *name, int32_t segment, int64_t offset, int is_global,
-                    char *special)
-{
-   (void)name;
-   (void)segment;
-   (void)offset;
-   (void)is_global;
-   (void)special;
-}
-
-static void debug32_directive(const char *directive, const char *params)
-{
-   (void)directive;
-   (void)params;
-}
-
 static void debug32_typevalue(int32_t type)
 {
     int32_t stype, ssize;
diff --git a/output/outelf64.c b/output/outelf64.c
index 3aee02cb..b6c04d6c 100644
--- a/output/outelf64.c
+++ b/output/outelf64.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 1996-2013 The NASM Authors - All Rights Reserved
+ *   Copyright 1996-2016 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
  *
@@ -161,8 +161,6 @@ static struct elf_symbol *lastsym;
 
 /* common debugging routines */
 static void debug64_typevalue(int32_t);
-static void debug64_deflabel(char *, int32_t, int64_t, int, char *);
-static void debug64_directive(const char *, const char *);
 
 /* stabs debugging routines */
 static void stabs64_linenum(const char *filename, int32_t linenumber, int32_t);
@@ -1431,8 +1429,8 @@ static struct dfmt df_dwarf = {
     "dwarf",
     dwarf64_init,
     dwarf64_linenum,
-    debug64_deflabel,
-    debug64_directive,
+    null_debug_deflabel,
+    null_debug_directive,
     debug64_typevalue,
     dwarf64_output,
     dwarf64_cleanup
@@ -1442,8 +1440,8 @@ static struct dfmt df_stabs = {
     "stabs",
     null_debug_init,
     stabs64_linenum,
-    debug64_deflabel,
-    debug64_directive,
+    null_debug_deflabel,
+    null_debug_directive,
     debug64_typevalue,
     stabs64_output,
     stabs64_cleanup
@@ -1472,22 +1470,6 @@ struct ofmt of_elf64 = {
 };
 
 /* common debugging routines */
-static void debug64_deflabel(char *name, int32_t segment, int64_t offset,
-                             int is_global, char *special)
-{
-    (void)name;
-    (void)segment;
-    (void)offset;
-    (void)is_global;
-    (void)special;
-}
-
-static void debug64_directive(const char *directive, const char *params)
-{
-    (void)directive;
-    (void)params;
-}
-
 static void debug64_typevalue(int32_t type)
 {
     int32_t stype, ssize;
diff --git a/output/outelfx32.c b/output/outelfx32.c
index 170c1171..42ab3aa3 100644
--- a/output/outelfx32.c
+++ b/output/outelfx32.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 1996-2013 The NASM Authors - All Rights Reserved
+ *   Copyright 1996-2016 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
  *
@@ -160,8 +160,6 @@ static struct elf_symbol *lastsym;
 
 /* common debugging routines */
 static void debugx32_typevalue(int32_t);
-static void debugx32_deflabel(char *, int32_t, int64_t, int, char *);
-static void debugx32_directive(const char *, const char *);
 
 /* stabs debugging routines */
 static void stabsx32_linenum(const char *filename, int32_t linenumber, int32_t);
@@ -1390,8 +1388,8 @@ static struct dfmt df_dwarf = {
     "dwarf",
     dwarfx32_init,
     dwarfx32_linenum,
-    debugx32_deflabel,
-    debugx32_directive,
+    null_debug_deflabel,
+    null_debug_directive,
     debugx32_typevalue,
     dwarfx32_output,
     dwarfx32_cleanup
@@ -1401,8 +1399,8 @@ static struct dfmt df_stabs = {
     "stabs",
     null_debug_init,
     stabsx32_linenum,
-    debugx32_deflabel,
-    debugx32_directive,
+    null_debug_deflabel,
+    null_debug_directive,
     debugx32_typevalue,
     stabsx32_output,
     stabsx32_cleanup
@@ -1431,22 +1429,6 @@ struct ofmt of_elfx32 = {
 };
 
 /* common debugging routines */
-static void debugx32_deflabel(char *name, int32_t segment, int64_t offset,
-                             int is_global, char *special)
-{
-    (void)name;
-    (void)segment;
-    (void)offset;
-    (void)is_global;
-    (void)special;
-}
-
-static void debugx32_directive(const char *directive, const char *params)
-{
-    (void)directive;
-    (void)params;
-}
-
 static void debugx32_typevalue(int32_t type)
 {
     int32_t stype, ssize;