StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove return's at the end of void functions 

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-03-01 23:43:51 +02:00
parent f278cea107
commit a3e40917ee
13 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/atom.c
View File

@ -103,7 +103,6 @@ xkb_init_atoms(InternAtomFuncPtr intern, GetAtomValueFuncPtr get_atom_value)
return;
do_intern_atom = intern;
do_get_atom_value = get_atom_value;
return;
}
}

5
src/maprules.c
View File

@ -79,7 +79,6 @@ InitInputLine(InputLine *line)
line->num_line= 0;
line->sz_line= DFLT_LINE_SIZE;
line->line= line->buf;
return;
}
static void
@ -91,7 +90,6 @@ FreeInputLine(InputLine *line)
line->num_line= 0;
line->sz_line= DFLT_LINE_SIZE;
line->line= line->buf;
return;
}
static int
@ -363,7 +361,6 @@ SetUpRemap(InputLine *line,RemapSpec *remap)
return;
}
remap->number++;
return;
}
static Bool
@ -979,7 +976,6 @@ XkbRF_ClearVarDescriptions(XkbRF_DescribeVarsPtr var)
}
free(var->desc);
var->desc= NULL;
return;
}
void
@ -1030,5 +1026,4 @@ XkbcRF_Free(XkbRF_RulesPtr rules,Bool freeRules)
if (freeRules)
free(rules);
return;
}

2
src/xkbcomp/action.c
View File

@ -1250,7 +1250,6 @@ ApplyActionFactoryDefaults(union xkb_action * action)
{
action->iso.real_mods = LockMask;
}
return;
}
static void
@ -1436,5 +1435,4 @@ ActionsInit(void)
constFalse.value.str = xkb_intern_atom("false");
actionsInitialized = 1;
}
return;
}

3
src/xkbcomp/alias.c
View File

@ -71,7 +71,6 @@ HandleCollision(AliasInfo * old, AliasInfo * new)
}
old->def.fileID = new->def.fileID;
old->def.merge = new->def.merge;
return;
}
static void
@ -83,7 +82,6 @@ InitAliasInfo(AliasInfo * info,
info->def.fileID = file_id;
strncpy(info->alias, alias, XkbKeyNameLength);
strncpy(info->real, real, XkbKeyNameLength);
return;
}
int
@ -122,7 +120,6 @@ ClearAliases(AliasInfo ** info_in)
{
if ((info_in) && (*info_in))
ClearCommonInfo(&(*info_in)->def);
return;
}
Bool

5
src/xkbcomp/compat.c
View File

@ -129,7 +129,6 @@ InitCompatInfo(CompatInfo * info, struct xkb_desc * xkb)
XkbNumKbdGroups * sizeof(GroupCompatInfo));
info->leds = NULL;
InitVModInfo(&info->vmods, xkb);
return;
}
static void
@ -156,7 +155,6 @@ ClearCompatInfo(CompatInfo * info, struct xkb_desc * xkb)
info->leds = (LEDInfo *) ClearCommonInfo(&info->leds->defs);
/* 3/30/94 (ef) -- XXX! Should free action info here */
ClearVModInfo(&info->vmods, xkb);
return;
}
static SymInterpInfo *
@ -387,7 +385,6 @@ MergeIncludedCompatMaps(CompatInfo * into, CompatInfo * from, unsigned merge)
else
into->errorCount++;
}
return;
}
typedef void (*FileHandler) (XkbFile * /* rtrn */ ,
@ -762,7 +759,6 @@ HandleCompatMapFile(XkbFile * file,
break;
}
}
return;
}
static void
@ -785,7 +781,6 @@ CopyInterps(CompatInfo * info,
}
compat->sym_interpret[compat->num_si++] = si->interp;
}
return;
}
Bool

22
src/xkbcomp/geometry.c
View File

@ -276,7 +276,6 @@ InitPropertyInfo(PropertyInfo * pi, GeometryInfo * info)
pi->defs.fileID = info->fileID;
pi->defs.merge = info->merge;
pi->name = pi->value = NULL;
return;
}
static void
@ -298,7 +297,6 @@ FreeProperties(PropertyInfo * pi, GeometryInfo * info)
next = (PropertyInfo *) tmp->defs.next;
free(tmp);
}
return;
}
static void
@ -321,7 +319,6 @@ InitKeyInfo(KeyInfo * key, RowInfo * row, GeometryInfo * info)
key->defs.next = NULL;
key->row = row;
}
return;
}
static void
@ -332,7 +329,6 @@ ClearKeyInfo(KeyInfo * key)
key->gap = 0;
key->shape = None;
key->color = None;
return;
}
static void
@ -352,7 +348,6 @@ FreeKeys(KeyInfo * key, RowInfo * row, GeometryInfo * info)
next = (KeyInfo *) tmp->defs.next;
free(tmp);
}
return;
}
static void
@ -375,7 +370,6 @@ InitRowInfo(RowInfo * row, SectionInfo * section, GeometryInfo * info)
row->keys = NULL;
InitKeyInfo(&row->dfltKey, row, info);
}
return;
}
static void
@ -389,7 +383,6 @@ ClearRowInfo(RowInfo * row, GeometryInfo * info)
FreeKeys(row->keys, row, info);
ClearKeyInfo(&row->dfltKey);
row->dfltKey.defs.defined |= _GK_Default;
return;
}
static void
@ -409,7 +402,6 @@ FreeRows(RowInfo * row, SectionInfo * section, GeometryInfo * info)
next = (RowInfo *) tmp->defs.next;
free(tmp);
}
return;
}
static DoodadInfo *
@ -473,7 +465,6 @@ InitDoodadInfo(DoodadInfo * di, unsigned type, SectionInfo * si,
if (info->nextPriority > XkbGeomMaxPriority)
info->nextPriority = XkbGeomMaxPriority;
}
return;
}
static void
@ -485,7 +476,6 @@ ClearDoodadInfo(DoodadInfo * di)
bzero(di, sizeof(DoodadInfo));
di->defs = defs;
di->defs.defined = 0;
return;
}
static void
@ -496,7 +486,6 @@ ClearOverlayInfo(OverlayInfo * ol)
ol->keys = (OverlayKeyInfo *) ClearCommonInfo(&ol->keys->defs);
ol->nKeys = 0;
}
return;
}
static void
@ -528,7 +517,6 @@ FreeDoodads(DoodadInfo * di, SectionInfo * si, GeometryInfo * info)
ClearDoodadInfo(tmp);
free(tmp);
}
return;
}
static void
@ -553,7 +541,6 @@ InitSectionInfo(SectionInfo * si, GeometryInfo * info)
si->name = xkb_intern_atom("default");
InitRowInfo(&si->dfltRow, si, info);
}
return;
}
static void
@ -572,7 +559,6 @@ DupSectionInfo(SectionInfo * into, SectionInfo * from, GeometryInfo * info)
into->dfltRow.dfltKey.defs.merge = defs.merge;
into->dfltRow.dfltKey.defs.next = NULL;
into->dfltRow.dfltKey.row = &into->dfltRow;
return;
}
static void
@ -596,7 +582,6 @@ ClearSectionInfo(SectionInfo * si, GeometryInfo * info)
si->doodads = NULL;
}
si->dfltRow.defs.defined = _GR_Default;
return;
}
static void
@ -616,7 +601,6 @@ FreeSections(SectionInfo * si, GeometryInfo * info)
next = (SectionInfo *) tmp->defs.next;
free(tmp);
}
return;
}
static void
@ -653,7 +637,6 @@ FreeShapes(ShapeInfo * si, GeometryInfo * info)
next = (ShapeInfo *) tmp->defs.next;
free(tmp);
}
return;
}
/***====================================================================***/
@ -666,7 +649,6 @@ InitGeometryInfo(GeometryInfo * info, unsigned fileID, unsigned merge)
info->merge = merge;
InitSectionInfo(&info->dfltSection, info);
info->dfltSection.defs.defined = _GS_Default;
return;
}
static void
@ -687,7 +669,6 @@ ClearGeometryInfo(GeometryInfo * info)
info->dfltSection.defs.defined = _GS_Default;
if (info->aliases)
ClearAliases(&info->aliases);
return;
}
/***====================================================================***/
@ -868,7 +849,6 @@ ReplaceDoodad(DoodadInfo * into, DoodadInfo * from)
next = from->defs.next;
ClearDoodadInfo(from);
from->defs.next = next;
return;
}
static DoodadInfo *
@ -1306,7 +1286,6 @@ MergeIncludedGeometry(GeometryInfo * into, GeometryInfo * from,
}
if (!MergeAliases(&into->aliases, &from->aliases, merge))
into->errorCount++;
return;
}
typedef void (*FileHandler) (XkbFile * /* file */ ,
@ -2925,7 +2904,6 @@ HandleGeometryFile(XkbFile * file,
break;
}
}
return;
}
/***====================================================================***/

1
src/xkbcomp/indicators.c
View File

@ -51,7 +51,6 @@ ClearIndicatorMapInfo(LEDInfo * info)
info->vmods = 0;
info->which_groups = info->groups = 0;
info->ctrls = 0;
return;
}
LEDInfo *

7
src/xkbcomp/keycodes.c
View File

@ -50,7 +50,6 @@ LongToKeyName(unsigned long val, char *name)
name[1] = ((val >> 16) & 0xff);
name[2] = ((val >> 8) & 0xff);
name[3] = (val & 0xff);
return;
}
/***====================================================================***/
@ -143,7 +142,6 @@ InitIndicatorNameInfo(IndicatorNameInfo * ii, KeyNamesInfo * info)
ii->ndx = 0;
ii->name = None;
ii->virtual = False;
return;
}
static void
@ -154,7 +152,6 @@ ClearIndicatorNameInfo(IndicatorNameInfo * ii, KeyNamesInfo * info)
ClearCommonInfo(&ii->defs);
info->leds = NULL;
}
return;
}
static IndicatorNameInfo *
@ -335,7 +332,6 @@ ClearKeyNamesInfo(KeyNamesInfo * info)
ClearIndicatorNameInfo(info->leds, info);
if (info->aliases)
ClearAliases(&info->aliases);
return;
}
static void
@ -349,7 +345,6 @@ InitKeyNamesInfo(KeyNamesInfo * info)
info->has_alt_forms = NULL;
ClearKeyNamesInfo(info);
info->errorCount = 0;
return;
}
static int
@ -539,7 +534,6 @@ MergeIncludedKeycodes(KeyNamesInfo * into, KeyNamesInfo * from,
|| (into->explicitMax < from->explicitMax))
into->explicitMax = from->explicitMax;
}
return;
}
/**
@ -855,7 +849,6 @@ HandleKeycodesFile(XkbFile * file,
break;
}
}
return;
}
/**

6
src/xkbcomp/keytypes.c
View File

@ -173,7 +173,6 @@ InitKeyTypesInfo(KeyTypesInfo * info, struct xkb_desc * xkb, KeyTypesInfo * from
}
}
}
return;
}
static void
@ -188,7 +187,6 @@ FreeKeyTypeInfo(KeyTypeInfo * type)
ClearCommonInfo(&type->preserve->defs);
type->preserve = NULL;
}
return;
}
static void
@ -206,7 +204,6 @@ FreeKeyTypesInfo(KeyTypesInfo * info)
info->types = (KeyTypeInfo *) ClearCommonInfo(&info->types->defs);
}
FreeKeyTypeInfo(&info->dflt);
return;
}
static KeyTypeInfo *
@ -356,7 +353,6 @@ MergeIncludedKeyTypes(KeyTypesInfo * into,
into->errorCount++;
}
into->stdPresent |= from->stdPresent;
return;
}
typedef void (*FileHandler) (XkbFile * /* file */ ,
@ -473,7 +469,6 @@ DeleteLevel1MapEntries(KeyTypeInfo * type)
type->nEntries--;
}
}
return;
}
/**
@ -1083,7 +1078,6 @@ HandleKeyTypesFile(XkbFile * file,
break;
}
}
return;
}
static Bool

1
src/xkbcomp/parseutils.c
View File

@ -758,7 +758,6 @@ CheckDefaultMap(XkbFile * maps)
}
}
}
return;
}
XkbFile *

7
src/xkbcomp/symbols.c
View File

@ -109,7 +109,6 @@ InitKeyInfo(KeyInfo * info)
info->nameForOverlayKey = 0;
info->repeat = RepeatUndefined;
info->allowNone = 0;
return;
}
/**
@ -142,7 +141,6 @@ FreeKeyInfo(KeyInfo * info)
info->nameForOverlayKey = 0;
info->repeat = RepeatUndefined;
info->allowNone = 0;
return;
}
/**
@ -260,7 +258,6 @@ InitSymbolsInfo(SymbolsInfo * info, struct xkb_desc * xkb)
InitVModInfo(&info->vmods, xkb);
info->action = NULL;
info->aliases = NULL;
return;
}
static void
@ -280,7 +277,6 @@ FreeSymbolsInfo(SymbolsInfo * info)
if (info->aliases)
ClearAliases(&info->aliases);
bzero((char *) info, sizeof(SymbolsInfo));
return;
}
static Bool
@ -745,7 +741,6 @@ MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * from,
}
if (!MergeAliases(&into->aliases, &from->aliases, merge))
into->errorCount++;
return;
}
typedef void (*FileHandler) (XkbFile * /* rtrn */ ,
@ -1642,7 +1637,6 @@ HandleSymbolsFile(XkbFile * file,
break;
}
}
return;
}
static Bool
@ -1865,7 +1859,6 @@ PrepareKeyDef(KeyInfo * key)
key->actsDefined &= 1;
key->typesDefined &= 1;
}
return;
}
/**

2
src/xkbcomp/vmod.c
View File

@ -41,7 +41,6 @@ InitVModInfo(VModInfo * info, struct xkb_desc * xkb)
{
ClearVModInfo(info, xkb);
info->errorCount = 0;
return;
}
void
@ -64,7 +63,6 @@ ClearVModInfo(VModInfo * info, struct xkb_desc * xkb)
info->defined |= bit;
}
}
return;
}
/***====================================================================***/

1
src/xkbcomp/xkbpath.c
View File

@ -199,7 +199,6 @@ XkbClearIncludePath(void)
nPathEntries = 0;
}
noDefaultPath = True;
return;
}
/**