Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15428 from mogemimi/fix-indent 

Fix indentation for readability
This commit is contained in:
minggo 2016-04-18 15:20:54 +08:00
parent 1e70fb5eb5 0825b1cc96
commit b88dc87b0a
2 changed files with 76 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cocos/storage/local-storage/LocalStorage-android.cpp
View File

@ -46,48 +46,48 @@ static std::string className = "org/cocos2dx/lib/Cocos2dxLocalStorage";
static void splitFilename (std::string& str)
{
size_t found = 0;
found=str.find_last_of("/\\");
if (found != std::string::npos)
{
str = str.substr(found+1);
}
size_t found = 0;
found = str.find_last_of("/\\");
if (found != std::string::npos)
{
str = str.substr(found + 1);
}
}
void localStorageInit( const std::string& fullpath)
{
if (fullpath.empty())
if (fullpath.empty())
return;
if( ! _initialized )
if (!_initialized)
{
std::string strDBFilename = fullpath;
splitFilename(strDBFilename);
if (JniHelper::callStaticBooleanMethod(className, "init", strDBFilename, "data")) {
_initialized = 1;
}
}
}
}
void localStorageFree()
{
if( _initialized ) {
if (_initialized) {
JniHelper::callStaticVoidMethod(className, "destory");
_initialized = 0;
}
_initialized = 0;
}
}
/** sets an item in the LS */
void localStorageSetItem( const std::string& key, const std::string& value)
{
assert( _initialized );
assert( _initialized );
JniHelper::callStaticVoidMethod(className, "setItem", key, value);
}
/** gets an item from the LS */
bool localStorageGetItem( const std::string& key, std::string *outItem )
{
assert( _initialized );
assert( _initialized );
JniMethodInfo t;
if (JniHelper::getStaticMethodInfo(t, "org/cocos2dx/lib/Cocos2dxLocalStorage", "getItem", "(Ljava/lang/String;)Ljava/lang/String;"))
@ -109,9 +109,8 @@ bool localStorageGetItem( const std::string& key, std::string *outItem )
/** removes an item from the LS */
void localStorageRemoveItem( const std::string& key )
{
assert( _initialized );
assert( _initialized );
JniHelper::callStaticVoidMethod(className, "removeItem", key);
}
/** removes all items from the LS */

122
cocos/storage/local-storage/LocalStorage.cpp
View File

@ -47,104 +47,104 @@ static sqlite3_stmt *_stmt_clear;
static void localStorageCreateTable()
{
const char *sql_createtable = "CREATE TABLE IF NOT EXISTS data(key TEXT PRIMARY KEY,value TEXT);";
sqlite3_stmt *stmt;
int ok=sqlite3_prepare_v2(_db, sql_createtable, -1, &stmt, nullptr);
ok |= sqlite3_step(stmt);
ok |= sqlite3_finalize(stmt);
const char *sql_createtable = "CREATE TABLE IF NOT EXISTS data(key TEXT PRIMARY KEY,value TEXT);";
sqlite3_stmt *stmt;
int ok = sqlite3_prepare_v2(_db, sql_createtable, -1, &stmt, nullptr);
ok |= sqlite3_step(stmt);
ok |= sqlite3_finalize(stmt);
if( ok != SQLITE_OK && ok != SQLITE_DONE)
printf("Error in CREATE TABLE\n");
if (ok != SQLITE_OK && ok != SQLITE_DONE)
printf("Error in CREATE TABLE\n");
}
void localStorageInit( const std::string& fullpath/* = "" */)
{
if( ! _initialized ) {
if (!_initialized) {
int ret = 0;
int ret = 0;
if (fullpath.empty())
ret = sqlite3_open(":memory:",&_db);
else
ret = sqlite3_open(fullpath.c_str(), &_db);
if (fullpath.empty())
ret = sqlite3_open(":memory:", &_db);
else
ret = sqlite3_open(fullpath.c_str(), &_db);
localStorageCreateTable();
localStorageCreateTable();
// SELECT
const char *sql_select = "SELECT value FROM data WHERE key=?;";
ret |= sqlite3_prepare_v2(_db, sql_select, -1, &_stmt_select, nullptr);
// SELECT
const char *sql_select = "SELECT value FROM data WHERE key=?;";
ret |= sqlite3_prepare_v2(_db, sql_select, -1, &_stmt_select, nullptr);
// REPLACE
const char *sql_update = "REPLACE INTO data (key, value) VALUES (?,?);";
ret |= sqlite3_prepare_v2(_db, sql_update, -1, &_stmt_update, nullptr);
// REPLACE
const char *sql_update = "REPLACE INTO data (key, value) VALUES (?,?);";
ret |= sqlite3_prepare_v2(_db, sql_update, -1, &_stmt_update, nullptr);
// DELETE
const char *sql_remove = "DELETE FROM data WHERE key=?;";
ret |= sqlite3_prepare_v2(_db, sql_remove, -1, &_stmt_remove, nullptr);
// DELETE
const char *sql_remove = "DELETE FROM data WHERE key=?;";
ret |= sqlite3_prepare_v2(_db, sql_remove, -1, &_stmt_remove, nullptr);
// Clear
const char *sql_clear = "DELETE FROM data;";
ret |= sqlite3_prepare_v2(_db, sql_clear, -1, &_stmt_clear, nullptr);
if( ret != SQLITE_OK ) {
printf("Error initializing DB\n");
// report error
}
if (ret != SQLITE_OK) {
printf("Error initializing DB\n");
// report error
}
_initialized = 1;
}
_initialized = 1;
}
}
void localStorageFree()
{
if( _initialized ) {
sqlite3_finalize(_stmt_select);
sqlite3_finalize(_stmt_remove);
sqlite3_finalize(_stmt_update);
if (_initialized) {
sqlite3_finalize(_stmt_select);
sqlite3_finalize(_stmt_remove);
sqlite3_finalize(_stmt_update);
sqlite3_close(_db);
sqlite3_close(_db);
_initialized = 0;
}
_initialized = 0;
}
}
/** sets an item in the LS */
void localStorageSetItem( const std::string& key, const std::string& value)
{
assert( _initialized );
assert( _initialized );
int ok = sqlite3_bind_text(_stmt_update, 1, key.c_str(), -1, SQLITE_TRANSIENT);
ok |= sqlite3_bind_text(_stmt_update, 2, value.c_str(), -1, SQLITE_TRANSIENT);
int ok = sqlite3_bind_text(_stmt_update, 1, key.c_str(), -1, SQLITE_TRANSIENT);
ok |= sqlite3_bind_text(_stmt_update, 2, value.c_str(), -1, SQLITE_TRANSIENT);
ok |= sqlite3_step(_stmt_update);
ok |= sqlite3_step(_stmt_update);
ok |= sqlite3_reset(_stmt_update);
ok |= sqlite3_reset(_stmt_update);
if( ok != SQLITE_OK && ok != SQLITE_DONE)
printf("Error in localStorage.setItem()\n");
if (ok != SQLITE_OK && ok != SQLITE_DONE)
printf("Error in localStorage.setItem()\n");
}
/** gets an item from the LS */
bool localStorageGetItem( const std::string& key, std::string *outItem )
{
assert( _initialized );
assert( _initialized );
int ok = sqlite3_reset(_stmt_select);
int ok = sqlite3_reset(_stmt_select);
ok |= sqlite3_bind_text(_stmt_select, 1, key.c_str(), -1, SQLITE_TRANSIENT);
ok |= sqlite3_step(_stmt_select);
const unsigned char *text = sqlite3_column_text(_stmt_select, 0);
ok |= sqlite3_bind_text(_stmt_select, 1, key.c_str(), -1, SQLITE_TRANSIENT);
ok |= sqlite3_step(_stmt_select);
const unsigned char *text = sqlite3_column_text(_stmt_select, 0);
if ( ok != SQLITE_OK && ok != SQLITE_DONE && ok != SQLITE_ROW )
{
printf("Error in localStorage.getItem()\n");
return false;
}
else if (!text)
if (ok != SQLITE_OK && ok != SQLITE_DONE && ok != SQLITE_ROW)
{
printf("Error in localStorage.getItem()\n");
return false;
}
else if (!text)
{
return false;
}
else
else
{
outItem->assign((const char*)text);
return true;
@ -154,16 +154,16 @@ bool localStorageGetItem( const std::string& key, std::string *outItem )
/** removes an item from the LS */
void localStorageRemoveItem( const std::string& key )
{
assert( _initialized );
assert( _initialized );
int ok = sqlite3_bind_text(_stmt_remove, 1, key.c_str(), -1, SQLITE_TRANSIENT);
int ok = sqlite3_bind_text(_stmt_remove, 1, key.c_str(), -1, SQLITE_TRANSIENT);
ok |= sqlite3_step(_stmt_remove);
ok |= sqlite3_step(_stmt_remove);
ok |= sqlite3_reset(_stmt_remove);
ok |= sqlite3_reset(_stmt_remove);
if( ok != SQLITE_OK && ok != SQLITE_DONE)
printf("Error in localStorage.removeItem()\n");
if (ok != SQLITE_OK && ok != SQLITE_DONE)
printf("Error in localStorage.removeItem()\n");
}
/** removes all items from the LS */