Fix some warnings.

This commit is contained in:
Themaister 2012-04-11 20:17:17 +02:00
parent 16d123dfab
commit 60cf4e569a

View File

@ -675,10 +675,10 @@ static bool load_imports(const char *dir_path, config_file_t *conf)
goto end;
}
unsigned bitmask;
unsigned bitmask = 0;
if (!config_get_hex(conf, mask_buf, &bitmask))
bitmask = 0;
unsigned bitequal;
unsigned bitequal = 0;
if (!config_get_hex(conf, equal_buf, &bitequal))
bitequal = 0;
@ -732,7 +732,7 @@ end:
static bool load_shader(const char *dir_path, unsigned i, config_file_t *conf)
{
char *shader_path;
char *shader_path = NULL;
char attr_buf[64];
char path_buf[PATH_MAX];
@ -791,8 +791,8 @@ static bool load_shader_params(unsigned i, config_file_t *conf)
}
char attr_name_buf[64];
float fattr;
int iattr;
float fattr = 0.0f;
int iattr = 0;
struct gl_fbo_scale *scale = &cg_scale[i + 1]; // Shader 0 is passthrough shader. Start at 1.
scale->valid = true;
@ -896,7 +896,7 @@ static bool load_preset(const char *path)
if (!load_stock())
return false;
int shaders;
int shaders = 0;
// Basedir.
char dir_path[PATH_MAX];
char *ptr = NULL;
@ -939,7 +939,7 @@ static bool load_preset(const char *path)
// Check filter params.
for (int i = 0; i < shaders; i++)
{
bool smooth;
bool smooth = false;
char filter_name_buf[64];
print_buf(filter_name_buf, "filter_linear%u", i);
if (config_get_bool(conf, filter_name_buf, &smooth))