[xml/sgml-commit] [SCM] linuxdoc-tools package for Debian. branch, master, updated. debian/0.9.66-4-g91794c3

[Agustin Martin Domingo]

The following commit has been merged in the master branch:
commit 91794c3c4f5c089e6b3f559aed02bd273041415a
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Thu Oct 6 12:59:08 2011 +0200

    Fix 'function definition has qualified void return type' gcc warnings.
    
    Some functions used 'volatile void'. Since void already specifies a
    return type of nothingness, doesn't make much sense to be considered
    "volatile".
    
    This was accepted by gcc, but considered an error by other compilers.
    gcc now warns about this.
    
    Note that this deals with "volatile void", not "volatile void *".

diff --git a/sgmls-1.1/replace.c b/sgmls-1.1/replace.c
index 95fa113..1d14ae1 100644
--- a/sgmls-1.1/replace.c
+++ b/sgmls-1.1/replace.c
@@ -47,7 +47,7 @@ static struct replacement_item **add_replacement_data
 static struct replacement_item **add_replacement_attr
   P((struct replacement_item **, char *));
 static int hash P((enum event_type, char *));
-static NO_RETURN void parse_error VP((char *,...));
+static void parse_error VP((char *,...));
 static VOID buffer_init P((struct buffer *));
 static VOID buffer_append P((struct buffer *, int));
 static char *buffer_extract P((struct buffer *));
@@ -442,7 +442,7 @@ UNIV xrealloc(p, size)
   return p;
 }
      
-static NO_RETURN
+static
 #ifdef VARARGS
 void parse_error(va_alist) va_dcl
 #else
diff --git a/sgmls-1.1/sgmls.c b/sgmls-1.1/sgmls.c
index 5af7e5b..387a34b 100644
--- a/sgmls-1.1/sgmls.c
+++ b/sgmls-1.1/sgmls.c
@@ -112,7 +112,7 @@ static char *errlist[] = {
   "Input line too long"
 };
 
-static void NO_RETURN error P((enum error_code));
+static void error P((enum error_code));
 static int parse_data P((char *, unsigned long *));
 static void parse_location P((char *, struct sgmls *));
 static void parse_notation P((char *, notation_s *));
@@ -1017,7 +1017,7 @@ UNIV xrealloc(p, n)
   return p;
 }
 
-static NO_RETURN
+static
 void error(num)
      enum error_code num;
 {
diff --git a/sgmls-1.1/sgmlsasp.c b/sgmls-1.1/sgmlsasp.c
index fdaf113..5fc8eb9 100644
--- a/sgmls-1.1/sgmlsasp.c
+++ b/sgmls-1.1/sgmlsasp.c
@@ -251,7 +251,6 @@ void output_begin_line()
     output_char('\n');
 }
 
-NO_RETURN
 #ifdef VARARGS
 void error(va_alist) va_dcl
 #else
diff --git a/sgmls-1.1/sgmlsasp.h b/sgmls-1.1/sgmlsasp.h
index b3ad402..9f0478d 100644
--- a/sgmls-1.1/sgmlsasp.h
+++ b/sgmls-1.1/sgmlsasp.h
@@ -21,6 +21,6 @@
 #define VP(parms) P(parms)
 #endif
 
-NO_RETURN void error VP((char *,...));
+void error VP((char *,...));
 
 extern int fold_general_names;

-- 
linuxdoc-tools package for Debian.