Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libs/web: rename template_parser field "mmap" to the more generic "data"

Browse source 
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Jo-Philipp Wich 2014-09-04 11:34:27 +00:00
parent 3ccdaa9b48
commit f8f558291a
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
modules/base/src/template_parser.c
View file

@ -82,15 +82,15 @@ struct template_parser * template_open(const char *file)
goto err; goto err;
parser->size = s.st_size; parser->size = s.st_size;
parser->mmap = mmap(NULL, parser->size, PROT_READ, MAP_PRIVATE, parser->data = mmap(NULL, parser->size, PROT_READ, MAP_PRIVATE,
parser->fd, 0); parser->fd, 0);
if (parser->mmap != MAP_FAILED) if (parser->data != MAP_FAILED)
{ {
parser->off = parser->mmap; parser->off = parser->data;
parser->cur_chunk.type = T_TYPE_INIT; parser->cur_chunk.type = T_TYPE_INIT;
parser->cur_chunk.s = parser->mmap; parser->cur_chunk.s = parser->data;
parser->cur_chunk.e = parser->mmap; parser->cur_chunk.e = parser->data;
return parser; return parser;
} }
@ -108,8 +108,8 @@ void template_close(struct template_parser *parser)
if (parser->gc != NULL) if (parser->gc != NULL)
free(parser->gc); free(parser->gc);
if ((parser->mmap != NULL) && (parser->mmap != MAP_FAILED)) if ((parser->data != NULL) && (parser->data != MAP_FAILED))
munmap(parser->mmap, parser->size); munmap(parser->data, parser->size);
if (parser->fd >= 0) if (parser->fd >= 0)
close(parser->fd); close(parser->fd);
@ -121,7 +121,7 @@ void template_text(struct template_parser *parser, const char *e)
{ {
const char *s = parser->off; const char *s = parser->off;
if (s < (parser->mmap + parser->size)) if (s < (parser->data + parser->size))
{ {
if (parser->strip_after) if (parser->strip_after)
{ {
@ -291,7 +291,7 @@ template_format_chunk(struct template_parser *parser, size_t *sz)
const char *template_reader(lua_State *L, void *ud, size_t *sz) const char *template_reader(lua_State *L, void *ud, size_t *sz)
{ {
struct template_parser *parser = ud; struct template_parser *parser = ud;
int rem = parser->size - (parser->off - parser->mmap); int rem = parser->size - (parser->off - parser->data);
char *tag; char *tag;
parser->prv_chunk = parser->cur_chunk; parser->prv_chunk = parser->cur_chunk;
@ -314,8 +314,8 @@ const char *template_reader(lua_State *L, void *ud, size_t *sz)
} }
else else
{ {
template_text(parser, parser->mmap + parser->size); template_text(parser, parser->data + parser->size);
parser->off = parser->mmap + parser->size; parser->off = parser->data + parser->size;
} }
} }
@ -331,7 +331,7 @@ const char *template_reader(lua_State *L, void *ud, size_t *sz)
else else
{ {
/* unexpected EOF */ /* unexpected EOF */
template_code(parser, parser->mmap + parser->size); template_code(parser, parser->data + parser->size);
*sz = 1; *sz = 1;
return "\033"; return "\033";
@ -366,12 +366,12 @@ int template_error(lua_State *L, struct template_parser *parser)
if (strfind((char *)err, strlen(err), "'char(27)'", 10) != NULL) if (strfind((char *)err, strlen(err), "'char(27)'", 10) != NULL)
{ {
off = parser->mmap + parser->size; off = parser->data + parser->size;
err = "'%>' expected before end of file"; err = "'%>' expected before end of file";
chunkline = 0; chunkline = 0;
} }
for (ptr = parser->mmap; ptr < off; ptr++) for (ptr = parser->data; ptr < off; ptr++)
if (*ptr == '\n') if (*ptr == '\n')
line++; line++;

2
modules/base/src/template_parser.h
View file

@ -58,7 +58,7 @@ struct template_chunk {
struct template_parser { struct template_parser {
int fd; int fd;
uint32_t size; uint32_t size;
char *mmap; char *data;
char *off; char *off;
char *gc; char *gc;
int line; int line;