Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-25 05:33:11 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1792 from swenner/static_analysis_fixes

Browse Source 
Static analysis fixes
This commit is contained in:
Juan Linietsky 2015-05-03 22:53:30 -03:00
commit c631d597ad
4 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
core/io/file_access_memory.cpp
View File

@ -39,7 +39,7 @@ void FileAccessMemory::register_file(String p_name, Vector<uint8_t> p_data) {
if (!files) {
files = memnew((Map<String, Vector<uint8_t> >));
};
}
String name;
if (Globals::get_singleton())
@ -49,7 +49,7 @@ void FileAccessMemory::register_file(String p_name, Vector<uint8_t> p_data) {
name = DirAccess::normalize_path(name);
(*files)[name] = p_data;
};
}
void FileAccessMemory::cleanup() {
@ -57,13 +57,13 @@ void FileAccessMemory::cleanup() {
return;
memdelete(files);
};
}
FileAccess* FileAccessMemory::create() {
return memnew(FileAccessMemory);
};
}
bool FileAccessMemory::file_exists(const String& p_name) {
@ -71,7 +71,7 @@ bool FileAccessMemory::file_exists(const String& p_name) {
name = DirAccess::normalize_path(name);
return files && (files->find(name) != NULL);
};
}
Error FileAccessMemory::_open(const String& p_path, int p_mode_flags) {
@ -89,57 +89,57 @@ Error FileAccessMemory::_open(const String& p_path, int p_mode_flags) {
pos = 0;
return OK;
};
}
void FileAccessMemory::close() {
data = NULL;
};
}
bool FileAccessMemory::is_open() const {
return data != NULL;
};
}
void FileAccessMemory::seek(size_t p_position) {
ERR_FAIL_COND(!data);
pos = p_position;
};
}
void FileAccessMemory::seek_end(int64_t p_position) {
ERR_FAIL_COND(!data);
pos = length + p_position;
};
}
size_t FileAccessMemory::get_pos() const {
ERR_FAIL_COND_V(!data, 0);
return pos;
};
}
size_t FileAccessMemory::get_len() const {
ERR_FAIL_COND_V(!data, 0);
return length;
};
}
bool FileAccessMemory::eof_reached() const {
return pos >= length;
};
}
uint8_t FileAccessMemory::get_8() const {
uint8_t ret;
uint8_t ret = 0;
if (pos < length) {
ret = data[pos];
};
}
++pos;
return ret;
};
}
int FileAccessMemory::get_buffer(uint8_t *p_dst,int p_length) const {
@ -156,19 +156,19 @@ int FileAccessMemory::get_buffer(uint8_t *p_dst,int p_length) const {
pos += p_length;
return read;
};
}
Error FileAccessMemory::get_error() const {
return pos >= length ? ERR_FILE_EOF : OK;
};
}
void FileAccessMemory::store_8(uint8_t p_byte) {
ERR_FAIL_COND(!data);
ERR_FAIL_COND(pos >= length);
data[pos++] = p_byte;
};
}
void FileAccessMemory::store_buffer(const uint8_t *p_src,int p_length) {
@ -176,11 +176,11 @@ void FileAccessMemory::store_buffer(const uint8_t *p_src,int p_length) {
int write = MIN(p_length, left);
if (write < p_length) {
WARN_PRINT("Writing less data than requested");
};
}
copymem(&data[pos], p_src, write);
pos += p_length;
};
}
FileAccessMemory::FileAccessMemory() {

4
drivers/chibi/cp_player_data_control.cpp
View File

@ -233,7 +233,7 @@ int CPPlayer::get_channel_voice(int p_channel) {
const char* CPPlayer::get_voice_sample_name(int p_voice) {
const char *name;
const char *name = NULL;
@ -302,7 +302,7 @@ const char * CPPlayer::get_voice_instrument_name(int p_voice) {
const char *name;
const char *name = NULL;

1
drivers/convex_decomp/b2Polygon.cpp
View File

@ -970,6 +970,7 @@ int32 DecomposeConvex(b2Polygon* p, b2Polygon* results, int32 maxPolys) {
}
if (nTri < 1) {
//Still no luck? Oh well...
delete[] triangulated;
return -1;
}
int32 nPolys = PolygonizeTriangles(triangulated, nTri, results, maxPolys);

2
platform/android/android_native_app_glue.h
View File

@ -26,7 +26,7 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
* Copyright (C) 2010 The Android Open Source Project
/* Copyright (C) 2010 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.