Merge branch 'master' into 14a_rework3

[proxmark3-svn] / client / pm3_binlib.c

diff --git a/client/pm3_binlib.c b/client/pm3_binlib.c
index 5c1e3cfcb94178563ca6ff5c3d3eb55cc81b0238..ed46c8e805d76debb2c247a700c9d381878a0d13 100644 (file)
--- a/client/pm3_binlib.c
+++ b/client/pm3_binlib.c
@@ -107,7 +107,8 @@ static int l_unpack(lua_State *L)           /** unpack(f,s, [init]) */
  size_t len;
  const char *s=luaL_checklstring(L,2,&len); /* switched s and f */
  const char *f=luaL_checkstring(L,1);
  size_t len;
  const char *s=luaL_checklstring(L,2,&len); /* switched s and f */
  const char *f=luaL_checkstring(L,1);

- int i_read = luaL_optint(L,3,1)-1;
+ int i_read = luaL_optinteger(L,3,1)-1;
+ // int i_read = luaL_optint(L,3,1)-1;

  unsigned int i;
  if (i_read >= 0) {
    i = i_read;
  unsigned int i;
  if (i_read >= 0) {
    i = i_read;


@@ -347,4 +348,3 @@ int set_bin_library (lua_State *L) {
    lua_pop(L, 1);
   return 1;
 }
    lua_pop(L, 1);
   return 1;
 }

-