projects
/
profile
/
tv
/
apps
/
native
/
filebrowser.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Apply ASSERT"
[profile/tv/apps/native/filebrowser.git]
/
src
/
data
/
FileInfo.cpp
diff --git
a/src/data/FileInfo.cpp
b/src/data/FileInfo.cpp
index
3ea0788
..
b50a98c
100644
(file)
--- a/
src/data/FileInfo.cpp
+++ b/
src/data/FileInfo.cpp
@@
-32,10
+32,12
@@
struct SFileInfo {
bool CFileInfo::Create(void)
{
bool CFileInfo::Create(void)
{
- ASSERT(!m);
+ if (m)
+ return false;
m = new SFileInfo;
m = new SFileInfo;
- ASSERT(m);
+ if (!m)
+ return false;
memset(m, 0, sizeof(SFileInfo));
memset(m, 0, sizeof(SFileInfo));
@@
-51,7
+53,8
@@
bool CFileInfo::Create(void)
void CFileInfo::Destroy(void)
{
void CFileInfo::Destroy(void)
{
- ASSERT(m);
+ if (!m)
+ return;
CExtNameInfo::Destroy();
CExtNameInfo::Destroy();
@@
-86,7
+89,8
@@
groups gType(media_content_type_e type)
bool CFileInfo::Duplicate(CNameInfo* obj)
{
bool CFileInfo::Duplicate(CNameInfo* obj)
{
- ASSERT(m);
+ if (!m)
+ return false;
if (!CExtNameInfo::Duplicate(obj))
return false;
if (!CExtNameInfo::Duplicate(obj))
return false;
@@
-97,7
+101,8
@@
bool CFileInfo::Duplicate(CNameInfo* obj)
bool CFileInfo::SetLoadInfo(media_info_h handle)
{
bool CFileInfo::SetLoadInfo(media_info_h handle)
{
- ASSERT(m);
+ if (!m)
+ return false;
m->handle = handle;
return true;
m->handle = handle;
return true;
@@
-105,7
+110,8
@@
bool CFileInfo::SetLoadInfo(media_info_h handle)
bool CFileInfo::Load(void)
{
bool CFileInfo::Load(void)
{
- ASSERT(m);
+ if (!m)
+ return false;
bool ret = false;
do {
bool ret = false;
do {