projects
/
platform
/
upstream
/
libxkbcommon.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6a578de
)
libxkbcomp: Drop unused format field for *Text functions
author
Dan Nicholson
<dbn.lists@gmail.com>
Sat, 28 Mar 2009 03:32:33 +0000
(20:32 -0700)
committer
Dan Nicholson
<dbn.lists@gmail.com>
Sat, 28 Mar 2009 19:01:36 +0000
(12:01 -0700)
src/xkbcomp/action.c
patch
|
blob
|
history
src/xkbcomp/keymap.c
patch
|
blob
|
history
src/xkbcomp/misc.c
patch
|
blob
|
history
src/xkbcomp/misc.h
patch
|
blob
|
history
src/xkbcomp/symbols.c
patch
|
blob
|
history
diff --git
a/src/xkbcomp/action.c
b/src/xkbcomp/action.c
index
c4ed983
..
92ad909
100644
(file)
--- a/
src/xkbcomp/action.c
+++ b/
src/xkbcomp/action.c
@@
-300,8
+300,7
@@
static Bool
ReportMismatch(unsigned action, unsigned field, const char *type)
{
ERROR2("Value of %s field must be of type %s\n", fieldText(field), type);
ReportMismatch(unsigned action, unsigned field, const char *type)
{
ERROR2("Value of %s field must be of type %s\n", fieldText(field), type);
- ACTION1("Action %s definition ignored\n",
- XkbActionTypeText(action, XkbMessage));
+ ACTION1("Action %s definition ignored\n", XkbActionTypeText(action));
return False;
}
return False;
}
@@
-309,7
+308,7
@@
static Bool
ReportIllegal(unsigned action, unsigned field)
{
ERROR2("Field %s is not defined for an action of type %s\n",
ReportIllegal(unsigned action, unsigned field)
{
ERROR2("Field %s is not defined for an action of type %s\n",
- fieldText(field), XkbActionTypeText(action
, XkbMessage
));
+ fieldText(field), XkbActionTypeText(action));
ACTION("Action definition ignored\n");
return False;
}
ACTION("Action definition ignored\n");
return False;
}
@@
-318,7
+317,7
@@
static Bool
ReportActionNotArray(unsigned action, unsigned field)
{
ERROR2("The %s field in the %s action is not an array\n",
ReportActionNotArray(unsigned action, unsigned field)
{
ERROR2("The %s field in the %s action is not an array\n",
- fieldText(field), XkbActionTypeText(action
, XkbMessage
));
+ fieldText(field), XkbActionTypeText(action));
ACTION("Action definition ignored\n");
return False;
}
ACTION("Action definition ignored\n");
return False;
}
@@
-328,7
+327,7
@@
ReportNotFound(unsigned action, unsigned field, const char *what, char *bad)
{
ERROR2("%s named %s not found\n", what, bad);
ACTION2("Ignoring the %s field of an %s action\n", fieldText(field),
{
ERROR2("%s named %s not found\n", what, bad);
ACTION2("Ignoring the %s field of an %s action\n", fieldText(field),
- XkbActionTypeText(action
, XkbMessage
));
+ XkbActionTypeText(action));
return False;
}
return False;
}
@@
-500,8
+499,7
@@
CheckGroupField(unsigned action,
{
ERROR2("Illegal group %d (must be in the range 1..%d)\n", rtrn.ival,
XkbNumKbdGroups);
{
ERROR2("Illegal group %d (must be in the range 1..%d)\n", rtrn.ival,
XkbNumKbdGroups);
- ACTION1("Action %s definition ignored\n",
- XkbActionTypeText(action, XkbMessage));
+ ACTION1("Action %s definition ignored\n", XkbActionTypeText(action));
return False;
}
if (value->op == OpNegate)
return False;
}
if (value->op == OpNegate)
diff --git
a/src/xkbcomp/keymap.c
b/src/xkbcomp/keymap.c
index
1c77ae7
..
7253d4e
100644
(file)
--- a/
src/xkbcomp/keymap.c
+++ b/
src/xkbcomp/keymap.c
@@
-75,7
+75,7
@@
CompileKeymap(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
break;
default:
ERROR1("Cannot compile %s alone into an XKM file\n",
break;
default:
ERROR1("Cannot compile %s alone into an XKM file\n",
- XkbConfigText(mainType
, XkbMessage
));
+ XkbConfigText(mainType));
return False;
}
have = 0;
return False;
}
have = 0;
@@
-88,16
+88,14
@@
CompileKeymap(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
if ((have & (1 << file->type)) != 0)
{
ERROR2("More than one %s section in a %s file\n",
if ((have & (1 << file->type)) != 0)
{
ERROR2("More than one %s section in a %s file\n",
- XkbConfigText(file->type, XkbMessage),
- XkbConfigText(mainType, XkbMessage));
+ XkbConfigText(file->type), XkbConfigText(mainType));
ACTION("All sections after the first ignored\n");
ok = False;
}
else if ((1 << file->type) & (~legal))
{
ERROR2("Cannot define %s in a %s file\n",
ACTION("All sections after the first ignored\n");
ok = False;
}
else if ((1 << file->type) & (~legal))
{
ERROR2("Cannot define %s in a %s file\n",
- XkbConfigText(file->type, XkbMessage),
- XkbConfigText(mainType, XkbMessage));
+ XkbConfigText(file->type), XkbConfigText(mainType));
ok = False;
}
else
ok = False;
}
else
@@
-107,8
+105,7
@@
CompileKeymap(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
case XkmLayoutFile:
case XkmKeymapFile:
WSGO2("Illegal %s configuration in a %s file\n",
case XkmLayoutFile:
case XkmKeymapFile:
WSGO2("Illegal %s configuration in a %s file\n",
- XkbConfigText(file->type, XkbMessage),
- XkbConfigText(mainType, XkbMessage));
+ XkbConfigText(file->type), XkbConfigText(mainType));
ACTION("Ignored\n");
ok = False;
break;
ACTION("Ignored\n");
ok = False;
break;
@@
-131,7
+128,7
@@
CompileKeymap(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
case XkmVirtualModsIndex:
case XkmIndicatorsIndex:
WSGO1("Found an isolated %s section\n",
case XkmVirtualModsIndex:
case XkmIndicatorsIndex:
WSGO1("Found an isolated %s section\n",
- XkbConfigText(file->type
, XkbMessage
));
+ XkbConfigText(file->type));
break;
default:
WSGO1("Unknown file type %d\n", file->type);
break;
default:
WSGO1("Unknown file type %d\n", file->type);
@@
-169,13
+166,12
@@
CompileKeymap(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
if (missing & bit)
{
ERROR2("Missing %s section in a %s file\n",
if (missing & bit)
{
ERROR2("Missing %s section in a %s file\n",
- XkbConfigText(i, XkbMessage),
- XkbConfigText(mainType, XkbMessage));
+ XkbConfigText(i), XkbConfigText(mainType));
missing &= ~bit;
}
}
ACTION1("Description of %s not compiled\n",
missing &= ~bit;
}
}
ACTION1("Description of %s not compiled\n",
- XkbConfigText(mainType
, XkbMessage
));
+ XkbConfigText(mainType));
ok = False;
}
ok = BindIndicators(xkb, True, unbound, NULL);
ok = False;
}
ok = BindIndicators(xkb, True, unbound, NULL);
diff --git
a/src/xkbcomp/misc.c
b/src/xkbcomp/misc.c
index
b26c9fa
..
4b9445c
100644
(file)
--- a/
src/xkbcomp/misc.c
+++ b/
src/xkbcomp/misc.c
@@
-99,8
+99,7
@@
ProcessIncludeFile(IncludeStmt * stmt,
if (!mapToUse)
{
ERROR3("No %s named \"%s\" in the include file \"%s\"\n",
if (!mapToUse)
{
ERROR3("No %s named \"%s\" in the include file \"%s\"\n",
- XkbConfigText(file_type, XkbMessage), stmt->map,
- stmt->file);
+ XkbConfigText(file_type), stmt->map, stmt->file);
ACTION("Exiting\n");
return False;
}
ACTION("Exiting\n");
return False;
}
@@
-115,8
+114,7
@@
ProcessIncludeFile(IncludeStmt * stmt,
if (mapToUse->type != file_type)
{
ERROR2("Include file wrong type (expected %s, got %s)\n",
if (mapToUse->type != file_type)
{
ERROR2("Include file wrong type (expected %s, got %s)\n",
- XkbConfigText(file_type, XkbMessage),
- XkbConfigText(mapToUse->type, XkbMessage));
+ XkbConfigText(file_type), XkbConfigText(mapToUse->type));
ACTION1("Include file \"%s\" ignored\n", stmt->file);
return False;
}
ACTION1("Include file \"%s\" ignored\n", stmt->file);
return False;
}
@@
-576,7
+574,7
@@
FindKeyNameForAlias(XkbcDescPtr xkb, unsigned long lname,
}
char *
}
char *
-XkbConfigText(unsigned config
, unsigned format
)
+XkbConfigText(unsigned config)
{
switch (config) {
case XkmSemanticsFile:
{
switch (config) {
case XkmSemanticsFile:
@@
-621,7
+619,7
@@
static char *actionTypeNames[XkbSA_NumActions]= {
};
char *
};
char *
-XkbActionTypeText(unsigned type
, unsigned format
)
+XkbActionTypeText(unsigned type)
{
if (type <= XkbSA_LastAction)
{
if (type <= XkbSA_LastAction)
diff --git
a/src/xkbcomp/misc.h
b/src/xkbcomp/misc.h
index
240233f
..
ae47987
100644
(file)
--- a/
src/xkbcomp/misc.h
+++ b/
src/xkbcomp/misc.h
@@
-109,9
+109,9
@@
extern Bool FindKeyNameForAlias(XkbcDescPtr /* xkb */ ,
);
extern char *
);
extern char *
-XkbConfigText(unsigned config
, unsigned format
);
+XkbConfigText(unsigned config);
extern char *
extern char *
-XkbActionTypeText(unsigned type
, unsigned format
);
+XkbActionTypeText(unsigned type);
#endif /* MISC_H */
#endif /* MISC_H */
diff --git
a/src/xkbcomp/symbols.c
b/src/xkbcomp/symbols.c
index
18833fc
..
8cdfc0c
100644
(file)
--- a/
src/xkbcomp/symbols.c
+++ b/
src/xkbcomp/symbols.c
@@
-449,8
+449,8
@@
MergeKeyGroups(SymbolsInfo * info,
("Multiple actions for level %d/group %d on key %s\n",
i + 1, group + 1, longText(into->name, XkbMessage));
ACTION2("Using %s, ignoring %s\n",
("Multiple actions for level %d/group %d on key %s\n",
i + 1, group + 1, longText(into->name, XkbMessage));
ACTION2("Using %s, ignoring %s\n",
- XkbActionTypeText(use->type
, XkbMessage
),
- XkbActionTypeText(ignore->type
, XkbMessage
));
+ XkbActionTypeText(use->type),
+ XkbActionTypeText(ignore->type));
}
resultActs[i] = *use;
}
}
resultActs[i] = *use;
}