Remove unneeded assignments and variables

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-02-24 16:00:10 +02:00
parent a48ddb5dd3
commit 9005624f94
5 changed files with 2 additions and 10 deletions

View File

@ -86,7 +86,6 @@ XkbcComputeRowBounds(struct xkb_geometry * geom, struct xkb_section * section, s
if (!geom || !section || !row)
return False;
pos = 0;
bounds = &row->bounds;
bzero(bounds, sizeof(struct xkb_bounds));

View File

@ -174,7 +174,6 @@ Bool endOfFile,spacePending,slashPending,inComment;
PR_DEBUG("The '!' legal only at start of line\n");
PR_DEBUG("Line containing '!' ignored\n");
line->num_line= 0;
inComment= 0;
break;
}
@ -521,7 +520,6 @@ squeeze_spaces(char *p1)
static Bool
MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
{
bzero((char *)mdefs,sizeof(XkbRF_MultiDefsRec));
mdefs->model = defs->model;
mdefs->options = _XkbDupString(defs->options);

View File

@ -230,7 +230,6 @@ ApplyAliases(struct xkb_desc * xkb, Bool toGeom, AliasInfo ** info_in)
*info_in = NULL;
return True;
}
status = Success;
if (toGeom)
{
if (!xkb->geom)

View File

@ -565,8 +565,6 @@ DupSectionInfo(SectionInfo * into, SectionInfo * from, GeometryInfo * info)
defs = into->defs;
*into = *from;
into->defs.fileID = defs.fileID;
into->defs.merge = defs.merge;
into->defs.next = NULL;
into->dfltRow.defs.fileID = defs.fileID;
into->dfltRow.defs.merge = defs.merge;
@ -1879,7 +1877,6 @@ SetSectionField(SectionInfo * si,
ExprResult tmp;
pField = NULL;
def = 0;
if (uStrCaseCmp(field, "priority") == 0)
{
if (arrayNdx != NULL)
@ -2601,10 +2598,8 @@ HandleOverlayDef(OverlayDef * def,
static Bool
HandleComplexKey(KeyDef * def, KeyInfo * key, GeometryInfo * info)
{
RowInfo *row;
ExprDef *expr;
row = key->row;
for (expr = def->expr; expr != NULL; expr = (ExprDef *) expr->common.next)
{
if (expr->op == OpAssign)
@ -2636,6 +2631,7 @@ HandleComplexKey(KeyDef * def, KeyInfo * key, GeometryInfo * info)
}
else
{
RowInfo *row = key->row;
switch (expr->type)
{
case TypeInt:

View File

@ -172,7 +172,7 @@ CompileKeymap(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
}
ACTION("Description of %s not compiled\n",
XkbcConfigText(mainType));
ok = False;
return False;
}
ok = BindIndicators(xkb, True, unbound, NULL);
return ok;