minor changes

starwing · starwing · commit 687dd09e376a · 2019-03-28T15:44:15.000+08:00
diff --git a/pb.c b/pb.c
@@ -965,6 +965,13 @@ static int lpb_unpackfmt(lua_State *L, int idx, const char *fmt, lpb_SliceEx *s)
     return rets;
 }
 
+static lpb_Slice *check_lslice(lua_State *L, int idx) {
+    lpb_SliceEx *s = check_slice(L, idx);
+    argcheck(L, lua_rawlen(L, 1) == sizeof(lpb_Slice),
+            idx, "unsupport operation for raw mode slice");
+    return (lpb_Slice*)s;
+}
+
 static int Lslice_new(lua_State *L) {
     lpb_Slice *s;
     lua_settop(L, 3);
@@ -984,7 +991,7 @@ static int Lslice_libcall(lua_State *L) {
 }
 
 static int Lslice_reset(lua_State *L) {
-    lpb_Slice *s = (lpb_Slice*)check_slice(L, 1);
+    lpb_Slice *s = check_lslice(L, 1);
     size_t size = lua_rawlen(L, 1);
     lpb_resetslice(L, s, size);
     if (!lua_isnoneornil(L, 2))
@@ -993,16 +1000,16 @@ static int Lslice_reset(lua_State *L) {
 }
 
 static int Lslice_tostring(lua_State *L) {
-    lpb_Slice *s = (lpb_Slice*)check_slice(L, 1);
+    lpb_SliceEx *s = check_slice(L, 1);
     lua_pushfstring(L, "pb.Slice: %p%s", s,
             lua_rawlen(L, 1) == sizeof(lpb_Slice) ? "" : " (raw)");
     return 1;
 }
 
 static int Lslice_len(lua_State *L) {
-    lpb_Slice *s = (lpb_Slice*)check_slice(L, 1);
-    lua_pushinteger(L, (lua_Integer)pb_len(s->curr.base));
-    lua_pushinteger(L, (lua_Integer)lpb_offset(&s->curr));
+    lpb_SliceEx *s = check_slice(L, 1);
+    lua_pushinteger(L, (lua_Integer)pb_len(s->base));
+    lua_pushinteger(L, (lua_Integer)lpb_offset(s));
     return 2;
 }
 
@@ -1013,13 +1020,6 @@ static int Lslice_unpack(lua_State *L) {
     return lpb_unpackfmt(L, 3, fmt, s);
 }
 
-static lpb_Slice *check_lslice(lua_State *L, int idx) {
-    lpb_Slice *s = (lpb_Slice*)check_slice(L, idx);
-    argcheck(L, lua_rawlen(L, 1) == sizeof(lpb_Slice),
-            idx, "unsupport operation for raw mode slice");
-    return s;
-}
-
 static int Lslice_level(lua_State *L) {
     lpb_Slice *s = check_lslice(L, 1);
     if (!lua_isnoneornil(L, 2)) {
