From 0b3d380f9fb79cc5a35ce34eecf56aea0d7fb9f9 Mon Sep 17 00:00:00 2001 From: Roberto Ierusalimschy Date: Mon, 5 Aug 2002 15:45:02 -0300 Subject: [PATCH] internal names --- lundump.c | 4 ++-- lzio.c | 4 ++-- lzio.h | 7 ++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lundump.c b/lundump.c index 7ea55ea4b..b1dd78abc 100644 --- a/lundump.c +++ b/lundump.c @@ -1,5 +1,5 @@ /* -** $Id: lundump.c,v 1.41 2002/06/06 13:22:56 lhf Exp lhf $ +** $Id: lundump.c,v 1.50 2002/06/17 13:51:01 roberto Exp roberto $ ** load pre-compiled Lua chunks ** See Copyright Notice in lua.h */ @@ -41,7 +41,7 @@ static int ezgetc (lua_State* L, ZIO* Z) static void ezread (lua_State* L, ZIO* Z, void* b, int n) { - int r=zread(Z,b,n); + int r=luaZ_read(Z,b,n); if (r!=0) unexpectedEOZ(L,Z); } diff --git a/lzio.c b/lzio.c index b693f6360..c2649eb2c 100644 --- a/lzio.c +++ b/lzio.c @@ -1,5 +1,5 @@ /* -** $Id: lzio.c,v 1.18 2002/06/03 20:11:07 roberto Exp roberto $ +** $Id: lzio.c,v 1.19 2002/06/06 12:40:22 roberto Exp roberto $ ** a generic input stream interface ** See Copyright Notice in lua.h */ @@ -45,7 +45,7 @@ void luaZ_init (ZIO *z, lua_Chunkreader reader, void *data, const char *name) { /* --------------------------------------------------------------- read --- */ -size_t luaZ_zread (ZIO *z, void *b, size_t n) { +size_t luaZ_read (ZIO *z, void *b, size_t n) { while (n) { size_t m; if (z->n == 0) { diff --git a/lzio.h b/lzio.h index a0dfa0917..e7807ec36 100644 --- a/lzio.h +++ b/lzio.h @@ -1,5 +1,5 @@ /* -** $Id: lzio.h,v 1.11 2002/06/03 20:11:07 roberto Exp roberto $ +** $Id: lzio.h,v 1.12 2002/06/06 12:40:22 roberto Exp roberto $ ** Buffered streams ** See Copyright Notice in lua.h */ @@ -11,9 +11,6 @@ #include "lua.h" -/* For Lua only */ -#define zread luaZ_zread - #define EOZ (-1) /* end of stream */ typedef struct zio ZIO; @@ -25,7 +22,7 @@ typedef struct zio ZIO; #define zname(z) ((z)->name) void luaZ_init (ZIO *z, lua_Chunkreader reader, void *data, const char *name); -size_t luaZ_zread (ZIO* z, void* b, size_t n); /* read next n bytes */ +size_t luaZ_read (ZIO* z, void* b, size_t n); /* read next n bytes */ int luaZ_lookahead (ZIO *z);