media_content_error("folder handle %x", _folder);
- if(STRING_VALID((const char *)sqlite3_column_text(stmt, 0)))
- _folder->folder_id = strdup((const char *)sqlite3_column_text(stmt, 0));
-
- if(STRING_VALID((const char *)sqlite3_column_text(stmt, 1)))
- _folder->path = strdup((const char *)sqlite3_column_text(stmt, 1));
-
- if(STRING_VALID((const char *)sqlite3_column_text(stmt, 2)))
- _folder->name = strdup((const char *)sqlite3_column_text(stmt, 2));
+ _folder->folder_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
+ _folder->path = g_strdup((const char *)sqlite3_column_text(stmt, 1));
+ _folder->name = g_strdup((const char *)sqlite3_column_text(stmt, 2));
*folder = (media_folder_h)_folder;
}
}
_playlist->playlist_id = (int)sqlite3_column_int(stmt, 0);
- if(STRING_VALID((const char *)sqlite3_column_text(stmt, 1)))
- _playlist->name = strdup((const char *)sqlite3_column_text(stmt, 1));
- if(STRING_VALID((const char *)sqlite3_column_text(stmt, 3)))
- _playlist->thumbnail_path = strdup((const char *)sqlite3_column_text(stmt, 3));
+ _playlist->name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
+ _playlist->thumbnail_path = g_strdup((const char *)sqlite3_column_text(stmt, 3));
*playlist = (media_playlist_h)_playlist;
}
{
media_storage_s *_storage = (media_storage_s*)storage;
- if(STRING_VALID((const char *)sqlite3_column_text(stmt, 0)))
- _storage->storage_id = strdup((const char *)sqlite3_column_text(stmt, 0));
-
- if(STRING_VALID((const char *)sqlite3_column_text(stmt, 1)))
- _storage->storage_name = strdup((const char *)sqlite3_column_text(stmt, 1));
-
- if(STRING_VALID((const char *)sqlite3_column_text(stmt, 2)))
- _storage->storage_path = strdup((const char *)sqlite3_column_text(stmt, 2));
-
- if(STRING_VALID((const char *)sqlite3_column_text(stmt, 3)))
- _storage->storage_account = strdup((const char *)sqlite3_column_text(stmt, 3));
-
+ _storage->storage_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
+ _storage->storage_name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
+ _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 2));
+ _storage->storage_account = g_strdup((const char *)sqlite3_column_text(stmt, 3));
_storage->storage_type = (int)sqlite3_column_int(stmt, 4);
return;
while(sqlite3_step(stmt) == SQLITE_ROW)
{
- id = (int)sqlite3_column_int(stmt,0);
-
- if(STRING_VALID((const char *)sqlite3_column_text(stmt, 1)))
- {
- if(tag_name)
- SAFE_FREE(tag_name);
+ SAFE_FREE(tag_name);
- tag_name = strdup((const char *)sqlite3_column_text(stmt, 1));
- }
+ id = (int)sqlite3_column_int(stmt,0);
+ tag_name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
}
_tag->tag_id = id;
}
_tag->tag_id = (int)sqlite3_column_int(stmt, 0);
-
- if(STRING_VALID((const char *)sqlite3_column_text(stmt, 1)))
- {
- _tag->name = strdup((const char *)sqlite3_column_text(stmt, 1));
- }
+ _tag->name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
*tag = (media_tag_h)_tag;
}