commit 9f3bf8812058f8bc01f9a811475416e29ccfaca1
author Mike Frysinger <vapier@chromium.org> Sun Nov 10 16:33:21 2013 -0500
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Nov 13 07:07:49 2013 +0000
tree 29d6788a68f17f347e3441481122529a3c4e0a2e
parent 130265e4bf5e053403d6281ca9e282d730bab672

warn_collector: fix building with newer flex

Flex before 2.5.37 would call YY_INPUT with a result of type int*.
But now it passes result as a yy_size_t* which leaders to errors:

lex.yy.c:1419:3: error: passing 'yy_size_t *' (aka 'unsigned int *') to
	parameter of type 'int *' converts between pointers to integer types
	with different sign

Change the type to match the newer flex.  This means we'll fail when
built with older versions, but we don't care about that.

BUG=chromium:219621
TEST=`emerge-x86-alex crash-reporter` works w/flex-2.5.37
TEST=`emerge-stumpy crash-reporter` works w/flex-2.5.37
CQ-DEPEND=CL:176183

Change-Id: I64e7fdf43af50b7a8aa65125c6a83b9c77ea6ae6
Reviewed-on: https://chromium-review.googlesource.com/176248
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

crash_reporter/warn_collector.l

diff --git a/crash_reporter/warn_collector.l b/crash_reporter/warn_collector.l
index 5cb12f1..0ca944a 100644
--- a/crash_reporter/warn_collector.l
+++ b/crash_reporter/warn_collector.l
@@ -26,7 +26,7 @@
 
 int WarnStart(void);
 void WarnEnd(void);
-void WarnInput(char *buf, int *result, size_t max_size);
+void WarnInput(char *buf, yy_size_t *result, size_t max_size);
 
 #define YY_INPUT(buf, result, max_size) WarnInput(buf, &result, max_size)
 
@@ -174,11 +174,12 @@
  *
  * 3.  We want to detect log rotation, and reopen the input file as needed.
  */
-void WarnInput(char *buf, int *result, size_t max_size) {
+void WarnInput(char *buf, yy_size_t *result, size_t max_size) {
   while (1) {
-    *result = read(yyin_fd, buf, max_size);
-    if (*result < 0)
+    ssize_t ret = read(yyin_fd, buf, max_size);
+    if (ret < 0)
       Die("read: %s", strerror(errno));
+    *result = ret;
     if (*result > 0 || fifo || filter)
       return;
     if (draining) {