Simplify tools/wrc a bit (RESEND)
Gerald Pfeifer
gerald at pfeifer.com
Sat Sep 6 19:09:42 CDT 2008
Any thoughts on this patch?
Gerald
---------- Forwarded message ----------
From: Gerald Pfeifer <gerald at pfeifer.com>
To: wine-patches at winehq.org
Date: Wed, 30 Jul 2008 17:01:54
Subject: Simplify tools/wrc a bit (fwd)
Hope you don't mind me pinging this; any objections?
Gerald
---------- Forwarded message ----------
From: Gerald Pfeifer <gerald at pfeifer.com>
To: wine-patches at winehq.org
Date: Sat, 21 Jun 2008 20:15:26 +0200 (CEST)
Subject: Simplify tools/wrc a bit
Seems we haven't use this for years (if ever).
Gerald
ChangeLog:
Remove parser_text and its being passed around since its not actually
used anywhere.
Index: tools/wrc/parser.h
===================================================================
RCS file: /home/wine/wine/tools/wrc/parser.h,v
retrieving revision 1.10
diff -u -3 -p -r1.10 parser.h
--- tools/wrc/parser.h 18 Jan 2008 12:35:53 -0000 1.10
+++ tools/wrc/parser.h 21 Jun 2008 18:02:08 -0000
@@ -30,7 +30,6 @@ int parser_parse(void);
/* From parser.l */
extern FILE *parser_in;
-extern char *parser_text;
extern int yy_flex_debug;
int parser_lex(void);
Index: tools/wrc/utils.c
===================================================================
RCS file: /home/wine/wine/tools/wrc/utils.c,v
retrieving revision 1.32
diff -u -3 -p -r1.32 utils.c
--- tools/wrc/utils.c 2 Apr 2008 11:57:01 -0000 1.32
+++ tools/wrc/utils.c 21 Jun 2008 18:02:08 -0000
@@ -47,7 +47,7 @@ void make_print(char *str)
}
#endif
-static void generic_msg(const char *s, const char *t, const char *n, va_list ap)
+static void generic_msg(const char *s, const char *t, va_list ap)
{
fprintf(stderr, "%s:%d:%d: %s: ", input_name ? input_name : "stdin", line_number, char_number, t);
vfprintf(stderr, s, ap);
@@ -70,7 +70,7 @@ int parser_error(const char *s, ...)
{
va_list ap;
va_start(ap, s);
- generic_msg(s, "Error", parser_text, ap);
+ generic_msg(s, "Error", ap);
fputc( '\n', stderr );
va_end(ap);
exit(1);
@@ -81,7 +81,7 @@ int parser_warning(const char *s, ...)
{
va_list ap;
va_start(ap, s);
- generic_msg(s, "Warning", parser_text, ap);
+ generic_msg(s, "Warning", ap);
va_end(ap);
return 0;
}
More information about the wine-patches
mailing list