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

Diff for /mandoc/mdoc.c between version 1.73 and 1.75

version 1.73, 2009/03/31 13:50:19 version 1.75, 2009/04/12 19:45:26
Line 1 
Line 1 
 /* $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@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   * purpose with or without fee is hereby granted, provided that the above
  * above copyright notice and this permission notice appear in all   * copyright notice and this permission notice appear in all copies.
  * copies.  
  *   *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * PERFORMANCE OF THIS SOFTWARE.  
  */   */
 #include <assert.h>  #include <assert.h>
 #include <ctype.h>  #include <ctype.h>
Line 180  mdoc_free(struct mdoc *mdoc)
Line 178  mdoc_free(struct mdoc *mdoc)
   
         mdoc_free1(mdoc);          mdoc_free1(mdoc);
         if (mdoc->htab)          if (mdoc->htab)
                 mdoc_tokhash_free(mdoc->htab);                  mdoc_hash_free(mdoc->htab);
         free(mdoc);          free(mdoc);
 }  }
   
Line 192  mdoc_alloc(void *data, int pflags, const struct mdoc_c
Line 190  mdoc_alloc(void *data, int pflags, const struct mdoc_c
   
         if (NULL == (p = calloc(1, sizeof(struct mdoc))))          if (NULL == (p = calloc(1, sizeof(struct mdoc))))
                 return(NULL);                  return(NULL);
           if (cb)
                   (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
   
         p->data = data;          p->data = data;
         p->htab = mdoc_tokhash_alloc();  
         p->pflags = pflags;          p->pflags = pflags;
   
         if (cb)          if (NULL == (p->htab = mdoc_hash_alloc())) {
                 (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));                  free(p);
                   return(NULL);
         if (mdoc_alloc1(p))          } else if (mdoc_alloc1(p))
                 return(p);                  return(p);
   
         free(p);          free(p);
         return(NULL);          return(NULL);
 }  }
Line 624  parsemacro(struct mdoc *m, int ln, char *buf)
Line 624  parsemacro(struct mdoc *m, int ln, char *buf)
                 return(1);                  return(1);
         }          }
   
         if (MDOC_MAX == (c = mdoc_tokhash_find(m->htab, mac))) {          if (MDOC_MAX == (c = mdoc_hash_find(m->htab, mac))) {
                 if ( ! macrowarn(m, ln, mac))                  if ( ! macrowarn(m, ln, mac))
                         goto err;                          goto err;
                 return(1);                  return(1);
Legend:
Removed from v.1.73  
changed lines
  Added in v.1.75
CVSweb