Static analyzer fixes:
Removes unused code in OS. Fixes return types. Fixes few typos.
This commit is contained in:
@@ -257,13 +257,13 @@ int Compression::decompress_dynamic(Vector<uint8_t> *p_dst_vect, int p_max_dst_s
|
||||
} while (ret != Z_STREAM_END);
|
||||
|
||||
// If all done successfully, resize the output if it's larger than the actual output
|
||||
if (ret == Z_STREAM_END && (unsigned long)p_dst_vect->size() > strm.total_out) {
|
||||
if ((unsigned long)p_dst_vect->size() > strm.total_out) {
|
||||
p_dst_vect->resize(strm.total_out);
|
||||
}
|
||||
|
||||
// clean up and return
|
||||
(void)inflateEnd(&strm);
|
||||
return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;
|
||||
return Z_OK;
|
||||
}
|
||||
|
||||
int Compression::zlib_level = Z_DEFAULT_COMPRESSION;
|
||||
|
||||
@@ -59,8 +59,6 @@ private:
|
||||
|
||||
static ZipArchive *instance;
|
||||
|
||||
FileAccess::CreateFunc fa_create_func;
|
||||
|
||||
public:
|
||||
void close_handle(unzFile p_file) const;
|
||||
unzFile get_file_handle(String p_file) const;
|
||||
|
||||
@@ -1003,10 +1003,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
|
||||
}
|
||||
|
||||
} break;
|
||||
case Variant::STRING: {
|
||||
_encode_string(p_variant, buf, r_len);
|
||||
|
||||
} break;
|
||||
case Variant::STRING:
|
||||
case Variant::STRING_NAME: {
|
||||
_encode_string(p_variant, buf, r_len);
|
||||
|
||||
|
||||
@@ -1003,31 +1003,19 @@ Expression::ENode *Expression::_parse_expression() {
|
||||
priority = 1;
|
||||
unary = true;
|
||||
break;
|
||||
|
||||
case Variant::OP_MULTIPLY:
|
||||
priority = 2;
|
||||
break;
|
||||
case Variant::OP_DIVIDE:
|
||||
priority = 2;
|
||||
break;
|
||||
case Variant::OP_MODULE:
|
||||
priority = 2;
|
||||
break;
|
||||
|
||||
case Variant::OP_ADD:
|
||||
priority = 3;
|
||||
break;
|
||||
case Variant::OP_SUBTRACT:
|
||||
priority = 3;
|
||||
break;
|
||||
|
||||
case Variant::OP_SHIFT_LEFT:
|
||||
priority = 4;
|
||||
break;
|
||||
case Variant::OP_SHIFT_RIGHT:
|
||||
priority = 4;
|
||||
break;
|
||||
|
||||
case Variant::OP_BIT_AND:
|
||||
priority = 5;
|
||||
break;
|
||||
@@ -1037,31 +1025,17 @@ Expression::ENode *Expression::_parse_expression() {
|
||||
case Variant::OP_BIT_OR:
|
||||
priority = 7;
|
||||
break;
|
||||
|
||||
case Variant::OP_LESS:
|
||||
priority = 8;
|
||||
break;
|
||||
case Variant::OP_LESS_EQUAL:
|
||||
priority = 8;
|
||||
break;
|
||||
case Variant::OP_GREATER:
|
||||
priority = 8;
|
||||
break;
|
||||
case Variant::OP_GREATER_EQUAL:
|
||||
priority = 8;
|
||||
break;
|
||||
|
||||
case Variant::OP_EQUAL:
|
||||
priority = 8;
|
||||
break;
|
||||
case Variant::OP_NOT_EQUAL:
|
||||
priority = 8;
|
||||
break;
|
||||
|
||||
case Variant::OP_IN:
|
||||
priority = 10;
|
||||
break;
|
||||
|
||||
case Variant::OP_NOT:
|
||||
priority = 11;
|
||||
unary = true;
|
||||
@@ -1072,7 +1046,6 @@ Expression::ENode *Expression::_parse_expression() {
|
||||
case Variant::OP_OR:
|
||||
priority = 13;
|
||||
break;
|
||||
|
||||
default: {
|
||||
_set_error("Parser bug, invalid operator in expression: " + itos(expression[i].op));
|
||||
return nullptr;
|
||||
|
||||
@@ -505,12 +505,8 @@ void OS::add_frame_delay(bool p_can_draw) {
|
||||
}
|
||||
|
||||
OS::OS() {
|
||||
void *volatile stack_bottom;
|
||||
|
||||
singleton = this;
|
||||
|
||||
_stack_bottom = (void *)(&stack_bottom);
|
||||
|
||||
Vector<Logger *> loggers;
|
||||
loggers.push_back(memnew(StdLogger));
|
||||
_set_logger(memnew(CompositeLogger(loggers)));
|
||||
|
||||
@@ -62,8 +62,6 @@ class OS {
|
||||
|
||||
char *last_error;
|
||||
|
||||
void *_stack_bottom;
|
||||
|
||||
CompositeLogger *_logger = nullptr;
|
||||
|
||||
bool restart_on_exit = false;
|
||||
|
||||
@@ -288,7 +288,7 @@ void NodePath::simplify() {
|
||||
if (data->path[i].operator String() == ".") {
|
||||
data->path.remove(i);
|
||||
i--;
|
||||
} else if (data->path[i].operator String() == ".." && i > 0 && data->path[i - 1].operator String() != "." && data->path[i - 1].operator String() != "..") {
|
||||
} else if (i > 0 && data->path[i].operator String() == ".." && data->path[i - 1].operator String() != "." && data->path[i - 1].operator String() != "..") {
|
||||
//remove both
|
||||
data->path.remove(i - 1);
|
||||
data->path.remove(i - 1);
|
||||
|
||||
Reference in New Issue
Block a user