Fix dead assignments
"Value stored to 'stmt' is never read" "Value stored to 'grp_to_use' is never read" And change 'grp' to 'group' if we're here. Signed-off-by: Ran Benita <ran234@gmail.com>master
parent
c7aef16649
commit
a46e4cc163
|
@ -928,14 +928,13 @@ static void
|
||||||
HandleCompatMapFile(CompatInfo *info, XkbFile *file, enum merge_mode merge)
|
HandleCompatMapFile(CompatInfo *info, XkbFile *file, enum merge_mode merge)
|
||||||
{
|
{
|
||||||
bool ok;
|
bool ok;
|
||||||
ParseCommon *stmt;
|
|
||||||
|
|
||||||
merge = (merge == MERGE_DEFAULT ? MERGE_AUGMENT : merge);
|
merge = (merge == MERGE_DEFAULT ? MERGE_AUGMENT : merge);
|
||||||
|
|
||||||
free(info->name);
|
free(info->name);
|
||||||
info->name = strdup_safe(file->name);
|
info->name = strdup_safe(file->name);
|
||||||
|
|
||||||
for (stmt = file->defs; stmt; stmt = stmt->next) {
|
for (ParseCommon *stmt = file->defs; stmt; stmt = stmt->next) {
|
||||||
switch (stmt->type) {
|
switch (stmt->type) {
|
||||||
case STMT_INCLUDE:
|
case STMT_INCLUDE:
|
||||||
ok = HandleIncludeCompatMap(info, (IncludeStmt *) stmt);
|
ok = HandleIncludeCompatMap(info, (IncludeStmt *) stmt);
|
||||||
|
|
|
@ -590,13 +590,12 @@ HandleLedNameDef(KeyNamesInfo *info, LedNameDef *def,
|
||||||
static void
|
static void
|
||||||
HandleKeycodesFile(KeyNamesInfo *info, XkbFile *file, enum merge_mode merge)
|
HandleKeycodesFile(KeyNamesInfo *info, XkbFile *file, enum merge_mode merge)
|
||||||
{
|
{
|
||||||
ParseCommon *stmt;
|
|
||||||
bool ok;
|
bool ok;
|
||||||
|
|
||||||
free(info->name);
|
free(info->name);
|
||||||
info->name = strdup_safe(file->name);
|
info->name = strdup_safe(file->name);
|
||||||
|
|
||||||
for (stmt = file->defs; stmt; stmt = stmt->next) {
|
for (ParseCommon *stmt = file->defs; stmt; stmt = stmt->next) {
|
||||||
switch (stmt->type) {
|
switch (stmt->type) {
|
||||||
case STMT_INCLUDE:
|
case STMT_INCLUDE:
|
||||||
ok = HandleIncludeKeycodes(info, (IncludeStmt *) stmt);
|
ok = HandleIncludeKeycodes(info, (IncludeStmt *) stmt);
|
||||||
|
|
|
@ -988,7 +988,7 @@ SetSymbolsField(SymbolsInfo *info, KeyInfo *keyi, const char *field,
|
||||||
static int
|
static int
|
||||||
SetGroupName(SymbolsInfo *info, ExprDef *arrayNdx, ExprDef *value)
|
SetGroupName(SymbolsInfo *info, ExprDef *arrayNdx, ExprDef *value)
|
||||||
{
|
{
|
||||||
xkb_layout_index_t grp, grp_to_use;
|
xkb_layout_index_t group, group_to_use;
|
||||||
xkb_atom_t name;
|
xkb_atom_t name;
|
||||||
|
|
||||||
if (!arrayNdx) {
|
if (!arrayNdx) {
|
||||||
|
@ -998,7 +998,7 @@ SetGroupName(SymbolsInfo *info, ExprDef *arrayNdx, ExprDef *value)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ExprResolveGroup(info->keymap->ctx, arrayNdx, &grp)) {
|
if (!ExprResolveGroup(info->keymap->ctx, arrayNdx, &group)) {
|
||||||
log_err(info->keymap->ctx,
|
log_err(info->keymap->ctx,
|
||||||
"Illegal index in group name definition; "
|
"Illegal index in group name definition; "
|
||||||
"Definition with non-integer array index ignored\n");
|
"Definition with non-integer array index ignored\n");
|
||||||
|
@ -1008,30 +1008,30 @@ SetGroupName(SymbolsInfo *info, ExprDef *arrayNdx, ExprDef *value)
|
||||||
if (!ExprResolveString(info->keymap->ctx, value, &name)) {
|
if (!ExprResolveString(info->keymap->ctx, value, &name)) {
|
||||||
log_err(info->keymap->ctx,
|
log_err(info->keymap->ctx,
|
||||||
"Group name must be a string; "
|
"Group name must be a string; "
|
||||||
"Illegal name for group %d ignored\n", grp);
|
"Illegal name for group %d ignored\n", group);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
grp_to_use = XKB_LAYOUT_INVALID;
|
|
||||||
if (info->explicit_group == XKB_LAYOUT_INVALID) {
|
if (info->explicit_group == XKB_LAYOUT_INVALID) {
|
||||||
grp_to_use = grp - 1;
|
group_to_use = group - 1;
|
||||||
}
|
}
|
||||||
else if (grp - 1 == 0) {
|
else if (group - 1 == 0) {
|
||||||
grp_to_use = info->explicit_group;
|
group_to_use = info->explicit_group;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
log_warn(info->keymap->ctx,
|
log_warn(info->keymap->ctx,
|
||||||
"An explicit group was specified for the '%s' map, "
|
"An explicit group was specified for the '%s' map, "
|
||||||
"but it provides a name for a group other than Group1 (%d); "
|
"but it provides a name for a group other than Group1 (%d); "
|
||||||
"Ignoring group name '%s'\n",
|
"Ignoring group name '%s'\n",
|
||||||
info->name, grp,
|
info->name, group,
|
||||||
xkb_atom_text(info->keymap->ctx, name));
|
xkb_atom_text(info->keymap->ctx, name));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (grp_to_use >= darray_size(info->group_names))
|
if (group_to_use >= darray_size(info->group_names))
|
||||||
darray_resize0(info->group_names, grp_to_use + 1);
|
darray_resize0(info->group_names, group_to_use + 1);
|
||||||
darray_item(info->group_names, grp_to_use) = name;
|
darray_item(info->group_names, group_to_use) = name;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1236,13 +1236,11 @@ static void
|
||||||
HandleSymbolsFile(SymbolsInfo *info, XkbFile *file, enum merge_mode merge)
|
HandleSymbolsFile(SymbolsInfo *info, XkbFile *file, enum merge_mode merge)
|
||||||
{
|
{
|
||||||
bool ok;
|
bool ok;
|
||||||
ParseCommon *stmt;
|
|
||||||
|
|
||||||
free(info->name);
|
free(info->name);
|
||||||
info->name = strdup_safe(file->name);
|
info->name = strdup_safe(file->name);
|
||||||
|
|
||||||
stmt = file->defs;
|
for (ParseCommon *stmt = file->defs; stmt; stmt = stmt->next) {
|
||||||
for (stmt = file->defs; stmt; stmt = stmt->next) {
|
|
||||||
switch (stmt->type) {
|
switch (stmt->type) {
|
||||||
case STMT_INCLUDE:
|
case STMT_INCLUDE:
|
||||||
ok = HandleIncludeSymbols(info, (IncludeStmt *) stmt);
|
ok = HandleIncludeSymbols(info, (IncludeStmt *) stmt);
|
||||||
|
|
|
@ -738,17 +738,16 @@ static void
|
||||||
HandleKeyTypesFile(KeyTypesInfo *info, XkbFile *file, enum merge_mode merge)
|
HandleKeyTypesFile(KeyTypesInfo *info, XkbFile *file, enum merge_mode merge)
|
||||||
{
|
{
|
||||||
bool ok;
|
bool ok;
|
||||||
ParseCommon *stmt;
|
|
||||||
|
|
||||||
free(info->name);
|
free(info->name);
|
||||||
info->name = strdup_safe(file->name);
|
info->name = strdup_safe(file->name);
|
||||||
|
|
||||||
for (stmt = file->defs; stmt; stmt = stmt->next) {
|
for (ParseCommon *stmt = file->defs; stmt; stmt = stmt->next) {
|
||||||
switch (stmt->type) {
|
switch (stmt->type) {
|
||||||
case STMT_INCLUDE:
|
case STMT_INCLUDE:
|
||||||
ok = HandleIncludeKeyTypes(info, (IncludeStmt *) stmt);
|
ok = HandleIncludeKeyTypes(info, (IncludeStmt *) stmt);
|
||||||
break;
|
break;
|
||||||
case STMT_TYPE: /* e.g. type "ONE_LEVEL" */
|
case STMT_TYPE:
|
||||||
ok = HandleKeyTypeDef(info, (KeyTypeDef *) stmt, merge);
|
ok = HandleKeyTypeDef(info, (KeyTypeDef *) stmt, merge);
|
||||||
break;
|
break;
|
||||||
case STMT_VAR:
|
case STMT_VAR:
|
||||||
|
@ -757,7 +756,7 @@ HandleKeyTypesFile(KeyTypesInfo *info, XkbFile *file, enum merge_mode merge)
|
||||||
"Statement ignored\n");
|
"Statement ignored\n");
|
||||||
ok = true;
|
ok = true;
|
||||||
break;
|
break;
|
||||||
case STMT_VMOD: /* virtual_modifiers NumLock, ... */
|
case STMT_VMOD:
|
||||||
ok = HandleVModDef(info->keymap, (VModDef *) stmt);
|
ok = HandleVModDef(info->keymap, (VModDef *) stmt);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue