test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-30 11:08:34 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix compile warnings

Browse Source
This commit is contained in:
xianjimli 2020-06-19 21:57:07 +08:00
parent fd7f8a5291
commit 6f75f96b46
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf_io/app_conf_init.c
View File

@ -27,7 +27,7 @@
#include "tkc/data_reader_factory.h" #include "tkc/data_reader_factory.h"
#include "tkc/data_writer_factory.h" #include "tkc/data_writer_factory.h"
static bool_t app_conf_exist(const char* url) { static bool_t app_conf_file_exist(const char* url) {
bool_t exist = FALSE; bool_t exist = FALSE;
data_reader_t* reader = data_reader_factory_create_reader(data_reader_factory(), url); data_reader_t* reader = data_reader_factory_create_reader(data_reader_factory(), url);
@ -42,7 +42,7 @@ static bool_t app_conf_exist(const char* url) {
static ret_t app_conf_prepare_default(const char* url, const char* default_url) { static ret_t app_conf_prepare_default(const char* url, const char* default_url) {
ret_t ret = RET_OK; ret_t ret = RET_OK;
if (!app_conf_exist(url)) { if (!app_conf_file_exist(url)) {
data_reader_t* reader = data_reader_factory_create_reader(data_reader_factory(), default_url); data_reader_t* reader = data_reader_factory_create_reader(data_reader_factory(), default_url);
if (reader != NULL) { if (reader != NULL) {
uint32_t size = data_reader_get_size(reader); uint32_t size = data_reader_get_size(reader);

4
src/tkc/object_compositor.c
View File

@ -40,7 +40,6 @@ static int32_t object_compositor_compare(object_t* obj, object_t* other) {
} }
static ret_t object_compositor_remove_prop(object_t* obj, const char* name) { static ret_t object_compositor_remove_prop(object_t* obj, const char* name) {
ret_t ret = RET_NOT_FOUND;
object_compositor_t* o = OBJECT_COMPOSITOR(obj); object_compositor_t* o = OBJECT_COMPOSITOR(obj);
if (object_remove_prop(o->obj1, name) == RET_OK) { if (object_remove_prop(o->obj1, name) == RET_OK) {
@ -51,7 +50,6 @@ static ret_t object_compositor_remove_prop(object_t* obj, const char* name) {
} }
static ret_t object_compositor_set_prop(object_t* obj, const char* name, const value_t* v) { static ret_t object_compositor_set_prop(object_t* obj, const char* name, const value_t* v) {
ret_t ret = RET_NOT_FOUND;
object_compositor_t* o = OBJECT_COMPOSITOR(obj); object_compositor_t* o = OBJECT_COMPOSITOR(obj);
if (object_set_prop(o->obj1, name, v) == RET_OK) { if (object_set_prop(o->obj1, name, v) == RET_OK) {
@ -62,7 +60,6 @@ static ret_t object_compositor_set_prop(object_t* obj, const char* name, const v
} }
static ret_t object_compositor_get_prop(object_t* obj, const char* name, value_t* v) { static ret_t object_compositor_get_prop(object_t* obj, const char* name, value_t* v) {
ret_t ret = RET_NOT_FOUND;
object_compositor_t* o = OBJECT_COMPOSITOR(obj); object_compositor_t* o = OBJECT_COMPOSITOR(obj);
if (object_get_prop(o->obj1, name, v) == RET_OK) { if (object_get_prop(o->obj1, name, v) == RET_OK) {
@ -95,7 +92,6 @@ static bool_t object_compositor_can_exec(object_t* obj, const char* name, const
} }
static ret_t object_compositor_exec(object_t* obj, const char* name, const char* args) { static ret_t object_compositor_exec(object_t* obj, const char* name, const char* args) {
ret_t ret = RET_OK;
object_compositor_t* o = OBJECT_COMPOSITOR(obj); object_compositor_t* o = OBJECT_COMPOSITOR(obj);
if (object_exec(o->obj1, name, args) == RET_OK) { if (object_exec(o->obj1, name, args) == RET_OK) {