mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15803 from s-hadinger/berry_comobj_typo 

Berry fix typo
This commit is contained in:
s-hadinger 2022-06-15 22:34:09 +02:00 committed by GitHub
parent 46fa84de9c 6b0fbf0798
commit 633dd61be5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libesp32/berry/src/be_object.c
View File

@ -46,14 +46,14 @@ bvalue* be_indexof(bvm *vm, int idx)
return vm->top + idx; return vm->top + idx;
} }
BERRY_API void be_newcomobj(bvm *vm, void *data, bntvfunc destory) BERRY_API void be_newcomobj(bvm *vm, void *data, bntvfunc destroy)
{ {
bcommomobj *obj; bcommomobj *obj;
bgcobject *gco = be_gcnew(vm, BE_COMOBJ, bcommomobj); bgcobject *gco = be_gcnew(vm, BE_COMOBJ, bcommomobj);
if ((obj = cast_comobj(gco)) != NULL) { if ((obj = cast_comobj(gco)) != NULL) {
bvalue* top = be_incrtop(vm); bvalue* top = be_incrtop(vm);
obj->data = data; obj->data = data;
obj->destory = destory; obj->destroy = destroy;
var_setobj(top, BE_COMOBJ, obj); var_setobj(top, BE_COMOBJ, obj);
} }
} }
@ -62,8 +62,8 @@ void be_commonobj_delete(bvm *vm, bgcobject *obj)
{ {
bcommomobj *co = cast_comobj(obj); bcommomobj *co = cast_comobj(obj);
if (co) { if (co) {
if (co->destory && co->data) { if (co->destroy && co->data) {
be_pushntvfunction(vm, co->destory); be_pushntvfunction(vm, co->destroy);
be_pushcomptr(vm, co->data); be_pushcomptr(vm, co->data);
be_call(vm, 1); be_call(vm, 1);
be_pop(vm, 2); be_pop(vm, 2);

2
lib/libesp32/berry/src/be_object.h
View File

@ -191,7 +191,7 @@ struct bntvclos {
typedef struct { typedef struct {
bcommon_header; bcommon_header;
void *data; void *data;
bntvfunc destory; bntvfunc destroy;
} bcommomobj; } bcommomobj;
typedef const char* (*breader)(void*, size_t*); typedef const char* (*breader)(void*, size_t*);

2
lib/libesp32/berry/src/berry.h
View File

@ -499,7 +499,7 @@ BERRY_API bbool be_pushiter(bvm *vm, int index);
BERRY_API void be_newlist(bvm *vm); BERRY_API void be_newlist(bvm *vm);
BERRY_API void be_newmap(bvm *vm); BERRY_API void be_newmap(bvm *vm);
BERRY_API void be_newmodule(bvm *vm); BERRY_API void be_newmodule(bvm *vm);
BERRY_API void be_newcomobj(bvm *vm, void *data, bntvfunc destory); BERRY_API void be_newcomobj(bvm *vm, void *data, bntvfunc destroy);
BERRY_API void be_newobject(bvm *vm, const char *name); BERRY_API void be_newobject(bvm *vm, const char *name);
BERRY_API bbool be_copy(bvm *vm, int index); BERRY_API bbool be_copy(bvm *vm, int index);
BERRY_API bbool be_setname(bvm *vm, int index, const char *name); BERRY_API bbool be_setname(bvm *vm, int index, const char *name);