aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lauxlib.c8
-rw-r--r--lua.h4
-rw-r--r--lzio.c4
3 files changed, 9 insertions, 7 deletions
diff --git a/lauxlib.c b/lauxlib.c
index f4e21d60..068e01f5 100644
--- a/lauxlib.c
+++ b/lauxlib.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lauxlib.c,v 1.79 2002/08/05 17:36:24 roberto Exp roberto $ 2** $Id: lauxlib.c,v 1.80 2002/08/06 15:32:22 roberto Exp roberto $
3** Auxiliary functions for building Lua libraries 3** Auxiliary functions for building Lua libraries
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -315,8 +315,9 @@ typedef struct LoadF {
315} LoadF; 315} LoadF;
316 316
317 317
318static const char *getF (void *ud, size_t *size) { 318static const char *getF (lua_State *L, void *ud, size_t *size) {
319 LoadF *lf = (LoadF *)ud; 319 LoadF *lf = (LoadF *)ud;
320 (void)L;
320 if (feof(lf->f)) return NULL; 321 if (feof(lf->f)) return NULL;
321 *size = fread(lf->buff, 1, LUAL_BUFFERSIZE, lf->f); 322 *size = fread(lf->buff, 1, LUAL_BUFFERSIZE, lf->f);
322 return (*size > 0) ? lf->buff : NULL; 323 return (*size > 0) ? lf->buff : NULL;
@@ -365,8 +366,9 @@ typedef struct LoadS {
365} LoadS; 366} LoadS;
366 367
367 368
368static const char *getS (void *ud, size_t *size) { 369static const char *getS (lua_State *L, void *ud, size_t *size) {
369 LoadS *ls = (LoadS *)ud; 370 LoadS *ls = (LoadS *)ud;
371 (void)L;
370 if (ls->size == 0) return NULL; 372 if (ls->size == 0) return NULL;
371 *size = ls->size; 373 *size = ls->size;
372 ls->size = 0; 374 ls->size = 0;
diff --git a/lua.h b/lua.h
index dc64fb34..786ba8d6 100644
--- a/lua.h
+++ b/lua.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lua.h,v 1.149 2002/08/06 15:32:22 roberto Exp roberto $ 2** $Id: lua.h,v 1.150 2002/08/06 17:06:56 roberto Exp roberto $
3** Lua - An Extensible Extension Language 3** Lua - An Extensible Extension Language
4** Tecgraf: Computer Graphics Technology Group, PUC-Rio, Brazil 4** Tecgraf: Computer Graphics Technology Group, PUC-Rio, Brazil
5** http://www.lua.org mailto:info@lua.org 5** http://www.lua.org mailto:info@lua.org
@@ -54,7 +54,7 @@ typedef int (*lua_CFunction) (lua_State *L);
54/* 54/*
55** functions that read blocks when loading Lua chunk 55** functions that read blocks when loading Lua chunk
56*/ 56*/
57typedef const char * (*lua_Chunkreader) (void *ud, size_t *size); 57typedef const char * (*lua_Chunkreader) (lua_State *L, void *ud, size_t *size);
58 58
59 59
60/* 60/*
diff --git a/lzio.c b/lzio.c
index c2649eb2..7ae7abb5 100644
--- a/lzio.c
+++ b/lzio.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lzio.c,v 1.19 2002/06/06 12:40:22 roberto Exp roberto $ 2** $Id: lzio.c,v 1.20 2002/08/05 18:45:02 roberto Exp roberto $
3** a generic input stream interface 3** a generic input stream interface
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -16,7 +16,7 @@
16 16
17int luaZ_fill (ZIO *z) { 17int luaZ_fill (ZIO *z) {
18 size_t size; 18 size_t size;
19 const char *buff = z->reader(z->data, &size); 19 const char *buff = z->reader(NULL, z->data, &size);
20 if (buff == NULL || size == 0) return EOZ; 20 if (buff == NULL || size == 0) return EOZ;
21 z->n = size - 1; 21 z->n = size - 1;
22 z->p = buff; 22 z->p = buff;