Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit merge util-macros 1.19.3 and xkbcomp 1.4.5.
details: https://anonhg.NetBSD.org/xsrc/rev/998dfb2a36fb
branches: trunk
changeset: 10691:998dfb2a36fb
user: mrg <mrg%NetBSD.org@localhost>
date: Tue Apr 27 01:47:39 2021 +0000
description:
merge util-macros 1.19.3 and xkbcomp 1.4.5.
diffstat:
external/mit/util-macros/dist/README | 22 --------
external/mit/xkbcomp/dist/expr.c | 98 ++++++++++++++++++------------------
external/mit/xkbcomp/dist/utils.h | 42 +--------------
3 files changed, 52 insertions(+), 110 deletions(-)
diffs (truncated from 494 to 300 lines):
diff -r a1a868376798 -r 998dfb2a36fb external/mit/util-macros/dist/README
--- a/external/mit/util-macros/dist/README Tue Apr 27 01:45:59 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-This is a set of autoconf macros used by the configure.ac scripts in
-other Xorg modular packages, and is needed to generate new versions
-of their configure scripts with autoconf.
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/util/macros
-
- http://cgit.freedesktop.org/xorg/util/macros/
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
diff -r a1a868376798 -r 998dfb2a36fb external/mit/xkbcomp/dist/expr.c
--- a/external/mit/xkbcomp/dist/expr.c Tue Apr 27 01:45:59 2021 +0000
+++ b/external/mit/xkbcomp/dist/expr.c Tue Apr 27 01:47:39 2021 +0000
@@ -6,19 +6,19 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
+ Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -149,7 +149,7 @@
*index_rtrn = expr->value.array.entry;
return True;
}
- WSGO1("Unexpected operator %d in ResolveLhs\n", expr->op);
+ WSGO("Unexpected operator %d in ResolveLhs\n", expr->op);
return False;
}
@@ -299,7 +299,7 @@
case ExprValue:
if (expr->type != TypeInt)
{
- ERROR1
+ ERROR
("Found constant of type %s where a modifier mask was expected\n",
exprTypeText(expr->type));
return False;
@@ -307,7 +307,7 @@
else if ((expr->value.ival >= XkbNumModifiers)
|| (expr->value.ival < 0))
{
- ERROR2("Illegal modifier index (%d, must be 0..%d)\n",
+ ERROR("Illegal modifier index (%d, must be 0..%d)\n",
expr->value.ival, XkbNumModifiers - 1);
return False;
}
@@ -325,7 +325,7 @@
None, expr->value.str, TypeInt, val_rtrn);
}
if (!ok)
- ERROR1("Cannot determine modifier index for \"%s\"\n",
+ ERROR("Cannot determine modifier index for \"%s\"\n",
XkbAtomText(NULL, expr->value.str, XkbMessage));
break;
case ExprFieldRef:
@@ -351,12 +351,12 @@
bogus = "assignment";
break;
default:
- WSGO1("Unknown operator %d in ResolveModIndex\n", expr->op);
+ WSGO("Unknown operator %d in ResolveModIndex\n", expr->op);
return False;
}
if (bogus)
{
- ERROR1("Modifier index must be a name or number, %s ignored\n",
+ ERROR("Modifier index must be a name or number, %s ignored\n",
bogus);
return False;
}
@@ -389,7 +389,7 @@
case ExprValue:
if (expr->type != TypeBoolean)
{
- ERROR1
+ ERROR
("Found constant of type %s where boolean was expected\n",
exprTypeText(expr->type));
return False;
@@ -421,7 +421,7 @@
None, expr->value.str, TypeBoolean, val_rtrn);
}
if (!ok)
- ERROR1("Identifier \"%s\" of type int is unknown\n",
+ ERROR("Identifier \"%s\" of type int is unknown\n",
XkbAtomText(NULL, expr->value.str, XkbMessage));
return ok;
case ExprFieldRef:
@@ -432,7 +432,7 @@
expr->value.field.field, TypeBoolean, val_rtrn);
}
if (!ok)
- ERROR2("Default \"%s.%s\" of type boolean is unknown\n",
+ ERROR("Default \"%s.%s\" of type boolean is unknown\n",
XkbAtomText(NULL, expr->value.field.element, XkbMessage),
XkbAtomText(NULL, expr->value.field.field, XkbMessage));
return ok;
@@ -460,13 +460,13 @@
case OpNegate:
if (bogus == NULL)
bogus = "Negation";
- ERROR1("%s of boolean values not permitted\n", bogus);
+ ERROR("%s of boolean values not permitted\n", bogus);
break;
case OpUnaryPlus:
ERROR("Unary \"+\" operator not permitted for boolean values\n");
break;
default:
- WSGO1("Unknown operator %d in ResolveBoolean\n", expr->op);
+ WSGO("Unknown operator %d in ResolveBoolean\n", expr->op);
break;
}
return False;
@@ -496,7 +496,7 @@
}
if ((expr->type != TypeInt) && (expr->type != TypeFloat))
{
- ERROR1("Found constant of type %s, expected a number\n",
+ ERROR("Found constant of type %s, expected a number\n",
exprTypeText(expr->type));
return False;
}
@@ -511,7 +511,7 @@
None, expr->value.str, TypeFloat, val_rtrn);
}
if (!ok)
- ERROR1("Numeric identifier \"%s\" unknown\n",
+ ERROR("Numeric identifier \"%s\" unknown\n",
XkbAtomText(NULL, expr->value.str, XkbMessage));
return ok;
case ExprFieldRef:
@@ -522,7 +522,7 @@
expr->value.field.field, TypeFloat, val_rtrn);
}
if (!ok)
- ERROR2("Numeric default \"%s.%s\" unknown\n",
+ ERROR("Numeric default \"%s.%s\" unknown\n",
XkbAtomText(NULL, expr->value.field.element, XkbMessage),
XkbAtomText(NULL, expr->value.field.field, XkbMessage));
return ok;
@@ -579,7 +579,7 @@
left = expr->value.child;
return ExprResolveFloat(left, val_rtrn, lookup, lookupPriv);
default:
- WSGO1("Unknown operator %d in ResolveFloat\n", expr->op);
+ WSGO("Unknown operator %d in ResolveFloat\n", expr->op);
break;
}
return False;
@@ -616,7 +616,7 @@
}
if ((expr->type != TypeInt) && (expr->type != TypeFloat))
{
- ERROR1
+ ERROR
("Found constant of type %s where an int was expected\n",
exprTypeText(expr->type));
return False;
@@ -632,7 +632,7 @@
None, expr->value.str, TypeInt, val_rtrn);
}
if (!ok)
- ERROR1("Identifier \"%s\" of type int is unknown\n",
+ ERROR("Identifier \"%s\" of type int is unknown\n",
XkbAtomText(NULL, expr->value.str, XkbMessage));
return ok;
case ExprFieldRef:
@@ -643,7 +643,7 @@
expr->value.field.field, TypeInt, val_rtrn);
}
if (!ok)
- ERROR2("Default \"%s.%s\" of type int is unknown\n",
+ ERROR("Default \"%s.%s\" of type int is unknown\n",
XkbAtomText(NULL, expr->value.field.element, XkbMessage),
XkbAtomText(NULL, expr->value.field.field, XkbMessage));
return ok;
@@ -700,7 +700,7 @@
left = expr->value.child;
return ExprResolveInteger(left, val_rtrn, lookup, lookupPriv);
default:
- WSGO1("Unknown operator %d in ResolveInteger\n", expr->op);
+ WSGO("Unknown operator %d in ResolveInteger\n", expr->op);
break;
}
return False;
@@ -722,7 +722,7 @@
case ExprValue:
if (expr->type != TypeString)
{
- ERROR1("Found constant of type %s, expected a string\n",
+ ERROR("Found constant of type %s, expected a string\n",
exprTypeText(expr->type));
return False;
}
@@ -740,7 +740,7 @@
None, expr->value.str, TypeString, val_rtrn);
}
if (!ok)
- ERROR1("Identifier \"%s\" of type string not found\n",
+ ERROR("Identifier \"%s\" of type string not found\n",
XkbAtomText(NULL, expr->value.str, XkbMessage));
return ok;
case ExprFieldRef:
@@ -751,7 +751,7 @@
expr->value.field.field, TypeString, val_rtrn);
}
if (!ok)
- ERROR2("Default \"%s.%s\" of type string not found\n",
+ ERROR("Default \"%s.%s\" of type string not found\n",
XkbAtomText(NULL, expr->value.field.element, XkbMessage),
XkbAtomText(NULL, expr->value.field.field, XkbMessage));
return ok;
@@ -791,7 +791,7 @@
case OpInvert:
if (bogus == NULL)
bogus = "Bitwise complement";
- ERROR1("%s of string values not permitted\n", bogus);
+ ERROR("%s of string values not permitted\n", bogus);
return False;
case OpNot:
left = expr->value.child;
@@ -808,7 +808,7 @@
}
return False;
default:
- WSGO1("Unknown operator %d in ResolveString\n", expr->op);
+ WSGO("Unknown operator %d in ResolveString\n", expr->op);
break;
}
return False;
@@ -829,7 +829,7 @@
case ExprValue:
if (expr->type != TypeKeyName)
{
- ERROR1("Found constant of type %s, expected a key name\n",
+ ERROR("Found constant of type %s, expected a key name\n",
exprTypeText(expr->type));
return False;
}
@@ -842,7 +842,7 @@
None, expr->value.str, TypeString, val_rtrn);
}
if (!ok)
- ERROR1("Identifier \"%s\" of type string not found\n",
+ ERROR("Identifier \"%s\" of type string not found\n",
XkbAtomText(NULL, expr->value.str, XkbMessage));
return ok;
case ExprFieldRef:
@@ -853,7 +853,7 @@
expr->value.field.field, TypeString, val_rtrn);
}
if (!ok)
- ERROR2("Default \"%s.%s\" of type key name not found\n",
+ ERROR("Default \"%s.%s\" of type key name not found\n",
XkbAtomText(NULL, expr->value.field.element, XkbMessage),
XkbAtomText(NULL, expr->value.field.field, XkbMessage));
return ok;
@@ -878,7 +878,7 @@
case OpInvert:
if (bogus == NULL)
bogus = "Bitwise complement";
Home |
Main Index |
Thread Index |
Old Index