version 1.126, 2011/02/09 09:05:52 |
version 1.127, 2011/03/15 16:23:51 |
Line 600 roff_parse(struct roff *r, const char *buf, int *pos) |
|
Line 600 roff_parse(struct roff *r, const char *buf, int *pos) |
|
t = (r->current_string = roff_getstrn(r, mac, maclen)) |
t = (r->current_string = roff_getstrn(r, mac, maclen)) |
? ROFF_USERDEF : roff_hash_find(mac, maclen); |
? ROFF_USERDEF : roff_hash_find(mac, maclen); |
|
|
*pos += maclen; |
*pos += (int)maclen; |
while (buf[*pos] && ' ' == buf[*pos]) |
while (buf[*pos] && ' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
Line 1137 roff_rm(ROFF_ARGS) |
|
Line 1137 roff_rm(ROFF_ARGS) |
|
|
|
cp = *bufp + pos; |
cp = *bufp + pos; |
while ('\0' != *cp) { |
while ('\0' != *cp) { |
name = roff_getname(r, &cp, ln, cp - *bufp); |
name = roff_getname(r, &cp, ln, (int)(cp - *bufp)); |
if ('\0' != *name) |
if ('\0' != *name) |
roff_setstr(r, name, NULL, 0); |
roff_setstr(r, name, NULL, 0); |
} |
} |
Line 1372 roff_setstr(struct roff *r, const char *name, const ch |
|
Line 1372 roff_setstr(struct roff *r, const char *name, const ch |
|
* One additional byte for the '\n' in multiline mode, |
* One additional byte for the '\n' in multiline mode, |
* and one for the terminating '\0'. |
* and one for the terminating '\0'. |
*/ |
*/ |
newch = strlen(string) + (multiline ? 2 : 1); |
newch = strlen(string) + (multiline ? 2u : 1u); |
if (NULL == n->string) { |
if (NULL == n->string) { |
n->string = mandoc_malloc(newch); |
n->string = mandoc_malloc(newch); |
*n->string = '\0'; |
*n->string = '\0'; |
Line 1383 roff_setstr(struct roff *r, const char *name, const ch |
|
Line 1383 roff_setstr(struct roff *r, const char *name, const ch |
|
} |
} |
|
|
/* Skip existing content in the destination buffer. */ |
/* Skip existing content in the destination buffer. */ |
c = n->string + oldch; |
c = n->string + (int)oldch; |
|
|
/* Append new content to the destination buffer. */ |
/* Append new content to the destination buffer. */ |
while (*string) { |
while (*string) { |