Remove asciisz from chars.in. It frees up a nice chunk of memory and at

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 038e0fbdf868d87d59300e5891d26d84bf3a9156..bcc6e4ca8434e9415d817c49f0283a7c79298808 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc.c,v 1.155 2010/07/01 23:01:47 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.159 2010/07/18 17:00:26 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -29,7 +30,6 @@
 #include <time.h>
 
 #include "mandoc.h"
 #include <time.h>
 
 #include "mandoc.h"

-#include "regs.h"

 #include "libmdoc.h"
 #include "libmandoc.h"
 
 #include "libmdoc.h"
 #include "libmandoc.h"
 


@@ -518,12 +518,21 @@ static void
 mdoc_node_free(struct mdoc_node *p)
 {
 
 mdoc_node_free(struct mdoc_node *p)
 {
 

+       /*
+        * XXX: if these end up being problematic in terms of memory
+        * management and dereferencing freed blocks, then make them
+        * into reference-counted double-pointers.
+        */
+

        if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type)
                if (p->data.Bd)
                        free(p->data.Bd);
        if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)
                if (p->data.Bl)
                        free(p->data.Bl);
        if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type)
                if (p->data.Bd)
                        free(p->data.Bd);
        if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)
                if (p->data.Bl)
                        free(p->data.Bl);

+       if (MDOC_Bf == p->tok && MDOC_HEAD == p->type)
+               if (p->data.Bf)
+                       free(p->data.Bf);

 
        if (p->string)
                free(p->string);
 
        if (p->string)
                free(p->string);


@@ -712,7 +721,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
 
        assert(buf < end);
 
 
        assert(buf < end);
 

-       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
+       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0))

                m->last->flags |= MDOC_EOS;
 
        return(1);
                m->last->flags |= MDOC_EOS;
 
        return(1);