diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-12-12 16:49:35 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-12-12 17:03:13 -0800 |
| commit | b79de3f42ff8412dcabf2f2a805cbcbd1c6907c3 (patch) | |
| tree | 3af42285af3531503407929069a002134dea7746 /hw/xfree86/parser/Pointer.c | |
| parent | 7801b3dcd6501e3de93a6d2cee93b2593806e922 (diff) | |
xf86 parser: convert Error to a varargs macro to clear gcc format warnings
Previously it always passed a format string with exactly one argument,
using NULL when the format string needed none. Now pass the right number
of arguments to clear gcc warnings of 'too many arguments for format'.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/xfree86/parser/Pointer.c')
| -rw-r--r-- | hw/xfree86/parser/Pointer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xfree86/parser/Pointer.c b/hw/xfree86/parser/Pointer.c index e8ad290f9..4edbf74d9 100644 --- a/hw/xfree86/parser/Pointer.c +++ b/hw/xfree86/parser/Pointer.c @@ -184,10 +184,10 @@ xf86parsePointerSection (void) switch (xf86getToken(ZMapTab)) { case NUMBER: if (val.num < 0) - Error (ZAXISMAPPING_MSG, NULL); + Error (ZAXISMAPPING_MSG); val1 = val.num; if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) { - Error (ZAXISMAPPING_MSG, NULL); + Error (ZAXISMAPPING_MSG); } if (asprintf(&s, "%lu %u", val1, val.num) == -1) s = NULL; @@ -199,7 +199,7 @@ xf86parsePointerSection (void) s = strdup("y"); break; default: - Error (ZAXISMAPPING_MSG, NULL); + Error (ZAXISMAPPING_MSG); break; } ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst, @@ -209,7 +209,7 @@ xf86parsePointerSection (void) case ALWAYSCORE: break; case EOF_TOKEN: - Error (UNEXPECTED_EOF_MSG, NULL); + Error (UNEXPECTED_EOF_MSG); break; default: Error (INVALID_KEYWORD_MSG, xf86tokenString ()); |