Author: jkim
Date: Tue May 21 19:17:02 2013
New Revision: 250875
URL: http://svnweb.freebsd.org/changeset/base/250875
Log:
Reduce compiler warnings.
Modified:
head/contrib/flex/buf.c
head/contrib/flex/filter.c
head/contrib/flex/flex.skl
head/contrib/flex/flexint.h
head/contrib/flex/gen.c
head/contrib/flex/libyywrap.c
head/contrib/flex/main.c
head/contrib/flex/misc.c
head/contrib/flex/scanflags.c
Modified: head/contrib/flex/buf.c
==============================================================================
--- head/contrib/flex/buf.c Tue May 21 19:11:11 2013 (r250874)
+++ head/contrib/flex/buf.c Tue May 21 19:17:02 2013 (r250875)
@@ -90,7 +90,8 @@ struct Buf *buf_prints (struct Buf *buf,
*/
struct Buf *buf_linedir (struct Buf *buf, const char* filename, int lineno)
{
- char *dst, *src, *t;
+ char *dst, *t;
+ const char *src;
t = flex_alloc (strlen ("#line \"\"\n") + /* constant parts */
2 * strlen (filename) + /* filename with
possibly all backslashes escaped */
Modified: head/contrib/flex/filter.c
==============================================================================
--- head/contrib/flex/filter.c Tue May 21 19:11:11 2013 (r250874)
+++ head/contrib/flex/filter.c Tue May 21 19:17:02 2013 (r250875)
@@ -135,9 +135,6 @@ struct filter *filter_create_int (struct
bool filter_apply_chain (struct filter * chain)
{
int pid, pipes[2];
- int r;
- const int readsz = 512;
- char *buf;
/* Tricky recursion, since we want to begin the chain
Modified: head/contrib/flex/flex.skl
==============================================================================
--- head/contrib/flex/flex.skl Tue May 21 19:11:11 2013 (r250874)
+++ head/contrib/flex/flex.skl Tue May 21 19:17:02 2013 (r250875)
@@ -196,7 +196,11 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]],
/* First, we deal with platform-specific or compiler-specific issues. */
#if defined(__FreeBSD__)
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
+#endif
#include <sys/cdefs.h>
+#include <stdint.h>
#else
#define __dead2
#endif
Modified: head/contrib/flex/flexint.h
==============================================================================
--- head/contrib/flex/flexint.h Tue May 21 19:11:11 2013 (r250874)
+++ head/contrib/flex/flexint.h Tue May 21 19:17:02 2013 (r250875)
@@ -5,7 +5,8 @@
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#if defined(__FreeBSD__) || \
+ (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types.
Modified: head/contrib/flex/gen.c
==============================================================================
--- head/contrib/flex/gen.c Tue May 21 19:11:11 2013 (r250874)
+++ head/contrib/flex/gen.c Tue May 21 19:17:02 2013 (r250875)
@@ -121,7 +121,7 @@ static struct yytbl_data *mkeoltbl (void
}
/* Generate the table for possible eol matches. */
-static void geneoltbl ()
+static void geneoltbl (void)
{
int i;
@@ -431,7 +431,7 @@ void genctbl ()
/* mkecstbl - Make equivalence-class tables. */
-struct yytbl_data *mkecstbl (void)
+static struct yytbl_data *mkecstbl (void)
{
int i;
struct yytbl_data *tbl = 0;
Modified: head/contrib/flex/libyywrap.c
==============================================================================
--- head/contrib/flex/libyywrap.c Tue May 21 19:11:11 2013
(r250874)
+++ head/contrib/flex/libyywrap.c Tue May 21 19:17:02 2013
(r250875)
@@ -21,6 +21,7 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+int yywrap (void);
int yywrap (void)
{
return 1;
Modified: head/contrib/flex/main.c
==============================================================================
--- head/contrib/flex/main.c Tue May 21 19:11:11 2013 (r250874)
+++ head/contrib/flex/main.c Tue May 21 19:17:02 2013 (r250875)
@@ -1575,11 +1575,12 @@ void readin ()
}
if (!do_yywrap) {
- if (!C_plus_plus)
+ if (!C_plus_plus) {
if (reentrant)
outn ("\n#define yywrap(yyscanner) 1");
else
outn ("\n#define yywrap() 1");
+ }
outn ("#define YY_SKIP_YYWRAP");
}
Modified: head/contrib/flex/misc.c
==============================================================================
--- head/contrib/flex/misc.c Tue May 21 19:11:11 2013 (r250874)
+++ head/contrib/flex/misc.c Tue May 21 19:17:02 2013 (r250875)
@@ -113,6 +113,7 @@ void action_define (defname, value)
}
+#ifdef notdef
/** Append "m4_define([[defname]],[[value]])m4_dnl\n" to the running buffer.
* @param defname The macro name.
* @param value The macro value, can be NULL, which is the same as the empty
string.
@@ -133,6 +134,7 @@ void action_m4_define (const char *defna
snprintf (buf, sizeof(buf), "m4_define([[%s]],[[%s]])m4_dnl\n",
defname, value?value:"");
add_action (buf);
}
+#endif
/* Append "new_text" to the running buffer. */
void add_action (new_text)
Modified: head/contrib/flex/scanflags.c
==============================================================================
--- head/contrib/flex/scanflags.c Tue May 21 19:11:11 2013
(r250874)
+++ head/contrib/flex/scanflags.c Tue May 21 19:17:02 2013
(r250875)
@@ -62,7 +62,7 @@ sf_init (void)
_sf_stk = (scanflags_t*) flex_alloc ( sizeof(scanflags_t) * (_sf_max =
32));
if (!_sf_stk)
lerrsf_fatal(_("Unable to allocate %ld of stack"),
- (long)sizeof(scanflags_t));
+ (void *)(uintptr_t)sizeof(scanflags_t));
_sf_stk[_sf_top_ix] = 0;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
