[BACK]Return to mdoc.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc.c between version 1.154 and 1.158

version 1.154, 2010/07/01 22:56:17 version 1.158, 2010/07/07 15:04:54
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * 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   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
Line 29 
Line 30 
 #include <time.h>  #include <time.h>
   
 #include "mandoc.h"  #include "mandoc.h"
 #include "regs.h"  
 #include "libmdoc.h"  #include "libmdoc.h"
 #include "libmandoc.h"  #include "libmandoc.h"
   
Line 514  mdoc_word_alloc(struct mdoc *m, int line, int pos, con
Line 514  mdoc_word_alloc(struct mdoc *m, int line, int pos, con
 }  }
   
   
 /* FIXME: put in mdoc_node_delete(). */  static void
 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 (MDOC_Bd == p->tok && MDOC_BLOCK == p->type)
                 if (p->data.Bd)                  if (p->data.Bd)
                         free(p->data.Bd);                          free(p->data.Bd);
         if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)          if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)
                 if (p->data.Bl)                  if (p->data.Bl)
                         free(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)          if (p->string)
                 free(p->string);                  free(p->string);
Line 739  macrowarn(struct mdoc *m, int ln, const char *buf, int
Line 747  macrowarn(struct mdoc *m, int ln, const char *buf, int
  * Parse a macro line, that is, a line beginning with the control   * Parse a macro line, that is, a line beginning with the control
  * character.   * character.
  */   */
 int  static int
 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)  mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 {  {
         enum mdoct        tok;          enum mdoct        tok;
Legend:
Removed from v.1.154  
changed lines
  Added in v.1.158
CVSweb