commit fd5e810e0858162a2b11229db4f17dca489c9d41
parent 067f761739f4cfa29384dca8b35c532978d0f372
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Fri, 15 Jul 2011 09:35:08 -0300
macro 'char2int' replaced by 'cast_uchar' (used by other files)
Diffstat:
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/lzio.c b/lzio.c
@@ -1,5 +1,5 @@
/*
-** $Id: lzio.c,v 1.32 2011/02/17 17:34:16 roberto Exp roberto $
+** $Id: lzio.c,v 1.33 2011/02/23 13:13:10 roberto Exp roberto $
** a generic input stream interface
** See Copyright Notice in lua.h
*/
@@ -29,7 +29,7 @@ int luaZ_fill (ZIO *z) {
return EOZ;
z->n = size - 1; /* discount char being returned */
z->p = buff;
- return char2int(*(z->p++));
+ return cast_uchar(*(z->p++));
}
diff --git a/lzio.h b/lzio.h
@@ -1,5 +1,5 @@
/*
-** $Id: lzio.h,v 1.23 2011/02/17 17:34:16 roberto Exp roberto $
+** $Id: lzio.h,v 1.24 2011/02/23 13:13:10 roberto Exp roberto $
** Buffered streams
** See Copyright Notice in lua.h
*/
@@ -17,9 +17,7 @@
typedef struct Zio ZIO;
-#define char2int(c) cast(int, cast(unsigned char, (c)))
-
-#define zgetc(z) (((z)->n--)>0 ? char2int(*(z)->p++) : luaZ_fill(z))
+#define zgetc(z) (((z)->n--)>0 ? cast_uchar(*(z)->p++) : luaZ_fill(z))
#define zungetc(z) ((z)->n++, (z)->p--)