version 1.1, 2008/12/15 01:54:58 |
version 1.2, 2008/12/15 02:23:12 |
Line 301 mdoc_parseln(struct mdoc *mdoc, char *buf) |
|
Line 301 mdoc_parseln(struct mdoc *mdoc, char *buf) |
|
|
|
i--; |
i--; |
|
|
(void)memcpy(tmp, buf + 1, i); |
(void)memcpy(tmp, buf + 1, (size_t)i); |
tmp[i++] = 0; |
tmp[i++] = 0; |
|
|
if (MDOC_MAX == (c = mdoc_find(mdoc, tmp))) |
if (MDOC_MAX == (c = mdoc_find(mdoc, tmp))) |
Line 398 mdoc_node_append(struct mdoc *mdoc, int pos, struct md |
|
Line 398 mdoc_node_append(struct mdoc *mdoc, int pos, struct md |
|
nn = mdoc_macronames[p->data.block.tok]; |
nn = mdoc_macronames[p->data.block.tok]; |
nt = "block"; |
nt = "block"; |
break; |
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
} |
} |
|
|
if (NULL == mdoc->first) { |
if (NULL == mdoc->first) { |
Line 429 mdoc_node_append(struct mdoc *mdoc, int pos, struct md |
|
Line 432 mdoc_node_append(struct mdoc *mdoc, int pos, struct md |
|
on = mdoc_macronames[mdoc->last->data.block.tok]; |
on = mdoc_macronames[mdoc->last->data.block.tok]; |
ot = "block"; |
ot = "block"; |
break; |
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
} |
} |
|
|
switch (p->type) { |
switch (p->type) { |
Line 575 mdoc_word_alloc(struct mdoc *mdoc, int pos, const char |
|
Line 581 mdoc_word_alloc(struct mdoc *mdoc, int pos, const char |
|
static void |
static void |
argfree(size_t sz, struct mdoc_arg *p) |
argfree(size_t sz, struct mdoc_arg *p) |
{ |
{ |
size_t i, j; |
int i, j; |
|
|
if (0 == sz) |
if (0 == sz) |
return; |
return; |
|
|
assert(p); |
assert(p); |
for (i = 0; i < sz; i++) |
/* LINTED */ |
|
for (i = 0; i < (int)sz; i++) |
if (p[i].sz > 0) { |
if (p[i].sz > 0) { |
assert(p[i].value); |
assert(p[i].value); |
for (j = 0; j < p[i].sz; j++) |
/* LINTED */ |
|
for (j = 0; j < (int)p[i].sz; j++) |
free(p[i].value[j]); |
free(p[i].value[j]); |
} |
} |
free(p); |
free(p); |
Line 674 mdoc_find(const struct mdoc *mdoc, const char *key) |
|
Line 682 mdoc_find(const struct mdoc *mdoc, const char *key) |
|
static void |
static void |
argcpy(struct mdoc_arg *dst, const struct mdoc_arg *src) |
argcpy(struct mdoc_arg *dst, const struct mdoc_arg *src) |
{ |
{ |
size_t i; |
int i; |
|
|
dst->arg = src->arg; |
dst->arg = src->arg; |
if (0 == (dst->sz = src->sz)) |
if (0 == (dst->sz = src->sz)) |
return; |
return; |
dst->value = xcalloc(dst->sz, sizeof(char *)); |
dst->value = xcalloc(dst->sz, sizeof(char *)); |
for (i = 0; i < dst->sz; i++) |
for (i = 0; i < (int)dst->sz; i++) |
dst->value[i] = xstrdup(src->value[i]); |
dst->value[i] = xstrdup(src->value[i]); |
} |
} |
|
|
Line 689 static struct mdoc_arg * |
|
Line 697 static struct mdoc_arg * |
|
argdup(size_t argsz, const struct mdoc_arg *args) |
argdup(size_t argsz, const struct mdoc_arg *args) |
{ |
{ |
struct mdoc_arg *pp; |
struct mdoc_arg *pp; |
size_t i; |
int i; |
|
|
if (0 == argsz) |
if (0 == argsz) |
return(NULL); |
return(NULL); |
|
|
pp = xcalloc((size_t)argsz, sizeof(struct mdoc_arg)); |
pp = xcalloc((size_t)argsz, sizeof(struct mdoc_arg)); |
for (i = 0; i < argsz; i++) |
for (i = 0; i < (int)argsz; i++) |
argcpy(&pp[i], &args[i]); |
argcpy(&pp[i], &args[i]); |
|
|
return(pp); |
return(pp); |
Line 705 argdup(size_t argsz, const struct mdoc_arg *args) |
|
Line 713 argdup(size_t argsz, const struct mdoc_arg *args) |
|
static void |
static void |
paramfree(size_t sz, char **p) |
paramfree(size_t sz, char **p) |
{ |
{ |
size_t i; |
int i; |
|
|
if (0 == sz) |
if (0 == sz) |
return; |
return; |
|
|
assert(p); |
assert(p); |
for (i = 0; i < sz; i++) |
/* LINTED */ |
|
for (i = 0; i < (int)sz; i++) |
free(p[i]); |
free(p[i]); |
free(p); |
free(p); |
} |
} |
|
|
paramdup(size_t sz, const char **p) |
paramdup(size_t sz, const char **p) |
{ |
{ |
char **pp; |
char **pp; |
size_t i; |
int i; |
|
|
if (0 == sz) |
if (0 == sz) |
return(NULL); |
return(NULL); |
|
|
pp = xcalloc(sz, sizeof(char *)); |
pp = xcalloc(sz, sizeof(char *)); |
for (i = 0; i < sz; i++) |
for (i = 0; i < (int)sz; i++) |
pp[i] = xstrdup(p[i]); |
pp[i] = xstrdup(p[i]); |
|
|
return(pp); |
return(pp); |