From 87c7e890b272f7bd668da2a70f2c8eaa0e77e3e3 Mon Sep 17 00:00:00 2001 From: qiuyiuestc Date: Tue, 19 Oct 2010 09:22:56 +0000 Subject: [PATCH] update module demo git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1021 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- examples/gui/demo_view_module.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/examples/gui/demo_view_module.c b/examples/gui/demo_view_module.c index 0ea3184226..7623f8fab8 100644 --- a/examples/gui/demo_view_module.c +++ b/examples/gui/demo_view_module.c @@ -10,7 +10,6 @@ #include #ifdef RT_USING_MODULE -static rt_module_t module = RT_NULL; static rtgui_view_t* _view = RT_NULL; /* 打开按钮的回调函数 */ @@ -37,24 +36,18 @@ static void open_btn_onbutton(rtgui_widget_t* widget, struct rtgui_event* event) /* 设置文件路径的标签 */ rtgui_filelist_view_get_fullpath(view, path, sizeof(path)); -#if 0 - if (module != RT_NULL) - { - rt_module_unload(module); - module = RT_NULL; - } -#endif + rt_memset(name, 0, sizeof(name)); /* 获得图像的类型 */ - if (rt_strstr(path, ".mo") != RT_NULL) + if (rt_strstr(path, ".mo") != RT_NULL || rt_strstr(path, ".so") != RT_NULL) { - memcpy(name, "mod", 4); + rt_memcpy(name, "mod", 4); } /* 如果图像文件有效,创建相应的rtgui_image对象 */ if (name[0] != '\0') - module = rt_module_load_from_file(name, path); + rt_module_load_from_file(name, path); } /* 删除 文件列表 视图 */