Added warnings for using macros in the wrong sections.

[mandoc.git] / xml.c

diff --git a/xml.c b/xml.c
index 607a87cb2f0d2053d87569a7a2c35a50542cd422..6d7da207e231043522481021aebb157b79937e5c 100644 (file)
--- a/xml.c
+++ b/xml.c
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.16 2008/12/05 19:45:15 kristaps Exp $ */
+/* $Id: xml.c,v 1.20 2008/12/08 12:46:28 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -34,11 +34,17 @@ static      ssize_t         xml_begintag(struct md_mbuf *, void *,
                                const struct md_args *, 
                                enum md_ns, int, 
                                const int *, const char **);
                                const struct md_args *, 
                                enum md_ns, int, 
                                const int *, const char **);

+static ssize_t         xml_beginstring(struct md_mbuf *, 
+                               const struct md_args *, 
+                               const char *, size_t);
+static ssize_t         xml_endstring(struct md_mbuf *, 
+                               const struct md_args *, 
+                               const char *, size_t);

 static int             xml_begin(struct md_mbuf *,
                                const struct md_args *, 
                                const struct tm *, 
                                const char *, const char *, 
 static int             xml_begin(struct md_mbuf *,
                                const struct md_args *, 
                                const struct tm *, 
                                const char *, const char *, 

-                               const char *, const char *);
+                               enum roffmsec, const char *);

 static int             xml_end(struct md_mbuf *, 
                                const struct md_args *);
 static ssize_t         xml_printtagname(struct md_mbuf *, 
 static int             xml_end(struct md_mbuf *, 
                                const struct md_args *);
 static ssize_t         xml_printtagname(struct md_mbuf *, 


@@ -58,6 +64,7 @@ xml_printtagargs(struct md_mbuf *mbuf, const int *argc,
                return(0);
        assert(argc && argv);
 
                return(0);
        assert(argc && argv);
 

+       /* LINTED */

        for (res = 0, i = 0; ROFF_ARGMAX != (c = argc[i]); i++) {
                if ( ! ml_nputs(mbuf, " ", 1, &res))
                        return(-1);
        for (res = 0, i = 0; ROFF_ARGMAX != (c = argc[i]); i++) {
                if ( ! ml_nputs(mbuf, " ", 1, &res))
                        return(-1);


@@ -116,7 +123,7 @@ xml_printtagname(struct md_mbuf *mbuf, enum md_ns ns, int tok)
 static int 
 xml_begin(struct md_mbuf *mbuf, const struct md_args *args,
                const struct tm *tm, const char *os, 
 static int 
 xml_begin(struct md_mbuf *mbuf, const struct md_args *args,
                const struct tm *tm, const char *os, 

-               const char *title, const char *section, 
+               const char *title, enum roffmsec section, 

                const char *vol)
 {
 
                const char *vol)
 {
 


@@ -124,7 +131,8 @@ xml_begin(struct md_mbuf *mbuf, const struct md_args *args,
                                "encoding=\"UTF-8\"?>\n", NULL))
                return(0);
        return(ml_puts(mbuf, "<mdoc xmlns:block=\"block\" "
                                "encoding=\"UTF-8\"?>\n", NULL))
                return(0);
        return(ml_puts(mbuf, "<mdoc xmlns:block=\"block\" "

-                               "xmlns:special=\"special\" "
+                               "xmlns:body=\"body\" "
+                               "xmlns:head=\"head\" "

                                "xmlns:inline=\"inline\">", NULL));
 }
 
                                "xmlns:inline=\"inline\">", NULL));
 }
 


@@ -138,6 +146,28 @@ xml_end(struct md_mbuf *mbuf, const struct md_args *args)
 }
 
 
 }
 
 

+/* ARGSUSED */
+static ssize_t 
+xml_beginstring(struct md_mbuf *mbuf, 
+               const struct md_args *args, 
+               const char *buf, size_t sz)
+{
+
+       return(0);
+}
+
+
+/* ARGSUSED */
+static ssize_t 
+xml_endstring(struct md_mbuf *mbuf, 
+               const struct md_args *args, 
+               const char *buf, size_t sz)
+{
+
+       return(0);
+}
+
+

 /* ARGSUSED */
 static ssize_t 
 xml_begintag(struct md_mbuf *mbuf, void *data,
 /* ARGSUSED */
 static ssize_t 
 xml_begintag(struct md_mbuf *mbuf, void *data,


@@ -169,6 +199,7 @@ int
 xml_alloc(void **p)
 {
 
 xml_alloc(void **p)
 {
 

+       *p = NULL;

        return(1);
 }
 
        return(1);
 }
 


@@ -210,6 +241,8 @@ md_init_xml(const struct md_args *args,
        cbs.ml_endtag = xml_endtag;
        cbs.ml_begin = xml_begin;
        cbs.ml_end = xml_end;
        cbs.ml_endtag = xml_endtag;
        cbs.ml_begin = xml_begin;
        cbs.ml_end = xml_end;

+       cbs.ml_beginstring = xml_beginstring;
+       cbs.ml_endstring = xml_endstring;

 
        return(mlg_alloc(args, rbuf, mbuf, &cbs));
 }
 
        return(mlg_alloc(args, rbuf, mbuf, &cbs));
 }