Squeezed some warnings.

This commit is contained in:
Sanel Zukan 2009-11-23 15:09:06 +00:00
parent a324dc2eb0
commit 60f5b321d4
5 changed files with 20 additions and 16 deletions

View File

@ -48,7 +48,7 @@ static unsigned int dur_val;
static bool block_xsettings_cb = false;
#define CHECK_SETTING(n, setting, action) (strcmp(setting->name, n) == 0) && \
(action == XSETTINGS_ACTION_NEW) || (action == XSETTINGS_ACTION_CHANGED)
((action == XSETTINGS_ACTION_NEW) || (action == XSETTINGS_ACTION_CHANGED))
#define KEY_VOLUME "Bell/Volume"
#define KEY_PITCH "Bell/Pitch"

View File

@ -844,13 +844,15 @@ double sign;
if (ready) init_value(top);
if (numb == -1.0)
if (dot) /* check whether we already have a dot */
return;
else
{
dot = 1;
set_display(value[top],DOT);
return;
if (dot) /* check whether we already have a dot */
return;
else
{
dot = 1;
set_display(value[top],DOT);
return;
}
}
if (emode)

View File

@ -510,13 +510,15 @@ double sign;
if (ready) init_value(top);
if (numb == -1.0)
if (dot) /* check whether we already have a dot */
return;
else
{
dot = 1;
set_display(value[top],DOT);
return;
if (dot) /* check whether we already have a dot */
return;
else
{
dot = 1;
set_display(value[top],DOT);
return;
}
}
if (emode)

View File

@ -121,7 +121,7 @@ static XkbRF_RulesPtr fetch_all_layouts(const String &current) {
for(int j = 0; x11_rules[j]; j++) {
snprintf(buf, sizeof(buf), "%s%s", x11_dirs[i], x11_rules[j]);
xkb_rules = XkbRF_Load(buf, "", True, True);
xkb_rules = XkbRF_Load(buf, (char*)"", True, True);
if(xkb_rules)
goto done;
}

View File

@ -333,8 +333,8 @@ static SaverPrefs *guess_config(void) {
break;
/* skip '.' and '..' */
if(entry->d_name[0] == '.' &&
(entry->d_name[1] == '\0' || entry->d_name[1] == '.' && entry->d_name[2] == '\0'))
if((entry->d_name[0] == '.' && entry->d_name[1] == '\0') ||
(entry->d_name[1] == '.' && entry->d_name[2] == '\0'))
{
continue;
}