remove duplicate declarations

change memory managemnet
randovania · Dec 31, 2023 · c62dccc · c62dccc
1 parent 0a4fa77
commit c62dccc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/lupa/_lupa.pyx b/lupa/_lupa.pyx
@@ -629,15 +629,15 @@ cdef class LuaRuntime:
         cdef size_t size
         cdef const char *err
         cdef ByteDescriptor bd
+        bd.length = 0
+        bd.data = NULL
         cdef void* ptr
         cdef TValue* o
         try:
             check_lua_stack(L, 1)
             status = lua.luaL_loadbuffer(L, lua_code_bytes, len(lua_code_bytes), NULL)
             if status == 0:
                 ptr = &bd
-                bd.length = 0
-                bd.data = NULL
                 o = <TValue*> L.top - 1
                 lua.luaU_dump(L, clvalue(o).l.p, byte_writer, ptr, 1)
                 return PyBytes_FromStringAndSize(bd.data, bd.length)
@@ -653,8 +653,7 @@ cdef class LuaRuntime:
                     raise LuaMemoryError(error)
                 raise LuaSyntaxError(error)
         finally:
-            if bd.length != 0:
-                free(bd.data)
+            free(bd.data)
             lua.lua_settop(L, old_top)
             unlock_runtime(self)
 
@@ -2544,6 +2543,5 @@ cdef int byte_writer(lua_State* L, void* new_data, size_t new_size, void* desc)
         bd.data = data
         bd.length = bd.length + new_size
     else:
-        free(data)
         return 1
     return 0
diff --git a/lupa/luaapi.pxd b/lupa/luaapi.pxd
@@ -273,22 +273,18 @@ cdef extern from "lua.h" nogil:
 cdef extern from "lstate.h" nogil:
     cppclass Proto:
         pass
-    ctypedef Proto Proto
 
     ctypedef struct LClosure:
         Proto* p
 
     union Closure:
         LClosure l
-    ctypedef Closure Closure
 
     union GCObject:
         Closure cl
-    ctypedef GCObject GCObject
 
     union Value:
         GCObject* gc
-    ctypedef Value Value
 
     ctypedef struct lua_TValue:
         Value value