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

Eliminate remaining gcc warnings 

Various one-liners (mostly removing unused variables) to make the code
safe for the full set of warnings used by the xorg macros.

On Debian-based systems, flex generates incorrect code resulting in two
warnings about yy_getcolumn and yy_setcolumn having no previous
declaration despite being non-static.  Fedora carries a patch to fix
this, and a bug has been filed on Debian's flex to add the patch:
http://bugs.debian.org/667027

Aside from this, it's now safe for --enable-strict-compilation.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2012-04-03 14:26:04 +01:00
parent 495d87b06d
commit 632d9f0336
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/context.c
View File

@ -147,12 +147,12 @@ xkb_context_num_include_paths(struct xkb_context *context)
* invalid index is passed.
*/
const char *
xkb_context_include_path_get(struct xkb_context *context, unsigned int index)
xkb_context_include_path_get(struct xkb_context *context, unsigned int idx)
{
if (index >= xkb_context_num_include_paths(context))
if (idx >= xkb_context_num_include_paths(context))
return NULL;
return context->include_paths[index];
return context->include_paths[idx];
}
/**

2
src/keysym.c
View File

@ -157,7 +157,7 @@ xkb_string_to_keysym(const char *s)
* As a last ditch effort, try without. */
if (strncmp(s, "XF86_", 5) == 0) {
xkb_keysym_t ret;
char *tmp = strdup(s);
tmp = strdup(s);
if (!tmp)
return XKB_KEYSYM_NO_SYMBOL;
memmove(&tmp[4], &tmp[5], strlen(s) - 5 + 1);

1
src/malloc.c
View File

@ -32,7 +32,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
XkbcAllocClientMap(struct xkb_desc * xkb, unsigned which, unsigned nTotalTypes)
{
int i;
struct xkb_client_map * map;
if (!xkb || ((nTotalTypes > 0) && (nTotalTypes < XkbNumRequiredTypes)))

10
src/xkbcomp/symbols.c
View File

@ -322,8 +322,6 @@ static Bool
ResizeKeyGroup(KeyInfo * key, unsigned int group, unsigned int numLevels,
unsigned sizeSyms, Bool forceActions)
{
Bool tooSmall;
unsigned newWidth;
int i;
if (key->syms[group] == NULL || key->sizeSyms[group] < sizeSyms)
@ -378,12 +376,12 @@ static Bool
MergeKeyGroups(SymbolsInfo * info,
KeyInfo * into, KeyInfo * from, unsigned group)
{
xkb_keysym_t *resultSyms;
xkb_keysym_t *resultSyms = NULL;
union xkb_action *resultActs;
unsigned int resultWidth;
unsigned int resultSize = 0;
int cur_idx = 0;
int i, j;
int i;
Bool report, clobber;
clobber = (from->defs.merge != MergeAugment);
@ -1943,9 +1941,9 @@ CopySymbolsDef(struct xkb_desc * xkb, KeyInfo *key, int start_from)
unsigned width, tmp, nGroups;
struct xkb_key_type * type;
Bool haveActions, autoType, useAlias;
xkb_keysym_t *outSyms;
xkb_atom_t types[XkbNumKbdGroups];
union xkb_action *outActs;
unsigned types[XkbNumKbdGroups];
unsigned int symIndex = 0;
useAlias = (start_from == 0);