make all dumps/loads go trhough Load/DumpVector (so it is easier

to adapt the code to correct endianess, if needed)

2 files changed, 20 insertions, 8 deletions

diff --git a/ldump.c b/ldump.c
index c86a03c8..5076c430 100644
--- a/ldump.c
+++ b/ldump.c
@@ -1,5 +1,5 @@
 /*
-** $Id: ldump.c,v 2.25 2014/03/10 17:56:32 roberto Exp roberto $
+** $Id: ldump.c,v 2.26 2014/03/11 18:05:46 roberto Exp roberto $
 ** save precompiled Lua chunks
 ** See Copyright Notice in lua.h
 */
@@ -25,9 +25,14 @@ typedef struct {
 } DumpState;
 
 
-#define DumpVar(x,D)            DumpBlock(&x,sizeof(x),D)
+/*
+** All high-level dumps go through DumpVector; you can change it to
+** change the endianess of the result
+*/
 #define DumpVector(v,n,D)       DumpBlock(v,(n)*sizeof((v)[0]),D)
 
+#define DumpLiteral(s,D)        DumpBlock(s, sizeof(s) - sizeof(char), D)
+
 
 static void DumpBlock (const void *b, size_t size, DumpState *D) {
   if (D->status == 0) {
@@ -38,6 +43,9 @@ static void DumpBlock (const void *b, size_t size, DumpState *D) {
 }
 
 
+#define DumpVar(x,D)            DumpVector(&x,1,D)
+
+
 static void DumpByte (int y, DumpState *D) {
   lu_byte x = (lu_byte)y;
   DumpVar(x, D);
@@ -160,8 +168,6 @@ static void DumpFunction (const Proto *f, DumpState *D) {
 }
 
 
-#define DumpLiteral(s,D)        DumpBlock(s, sizeof(s) - sizeof(char), D)
-
 static void DumpHeader (DumpState *D) {
   DumpLiteral(LUA_SIGNATURE, D);
   DumpByte(LUAC_VERSION, D);
diff --git a/lundump.c b/lundump.c
index 1807822f..e9d445e6 100644
--- a/lundump.c
+++ b/lundump.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lundump.c,v 2.32 2014/03/10 19:50:19 roberto Exp roberto $
+** $Id: lundump.c,v 2.33 2014/03/11 18:05:46 roberto Exp roberto $
 ** load precompiled Lua chunks
 ** See Copyright Notice in lua.h
 */
@@ -21,9 +21,6 @@
 #include "lzio.h"
 
 
-#define LoadVar(S,x)            LoadBlock(S,&x,sizeof(x))
-#define LoadVector(S,b,n)       LoadBlock(S,b,(n)*sizeof((b)[0]))
-
 #if !defined(luai_verifycode)
 #define luai_verifycode(L,b,f)  /* empty */
 #endif
@@ -43,12 +40,21 @@ static l_noret error(LoadState *S, const char *why) {
 }
 
 
+/*
+** All high-level loads go through LoadVector; you can change it to
+** adapt to the endianess of the input
+*/
+#define LoadVector(S,b,n)       LoadBlock(S,b,(n)*sizeof((b)[0]))
+
 static void LoadBlock (LoadState *S, void *b, size_t size) {
   if (luaZ_read(S->Z, b, size) != 0)
     error(S, "truncated");
 }
 
 
+#define LoadVar(S,x)            LoadVector(S,&x,1)
+
+
 static lu_byte LoadByte (LoadState *S) {
   lu_byte x;
   LoadVar(S, x);