[gentoo-commits] gentoo commit in src/patchsets/coreutils/8.24: 003_all_coreutils-gentoo-uname.patch

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      15/08/05 07:32:19

  Modified:             003_all_coreutils-gentoo-uname.patch
  Log:
  fix build failures when using -Werror

Revision  Changes    Path
1.5                  src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch?r1=1.4&r2=1.5

Index: 003_all_coreutils-gentoo-uname.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 003_all_coreutils-gentoo-uname.patch	5 Aug 2015 07:31:10 -0000	1.4
+++ 003_all_coreutils-gentoo-uname.patch	5 Aug 2015 07:32:19 -0000	1.5
@@ -11,7 +11,7 @@
 
 --- coreutils/src/uname.c
 +++ coreutils/src/uname.c
-@@ -50,6 +50,11 @@
+@@ -50,6 +50,12 @@
  # include <mach-o/arch.h>
  #endif
  
@@ -20,10 +20,11 @@
 +# define UNAME_HARDWARE_PLATFORM
 +#endif
 +
++#include "ignore-value.h"
  #include "system.h"
  #include "error.h"
  #include "quote.h"
-@@ -138,6 +143,119 @@
+@@ -138,6 +144,119 @@
    exit (status);
  }
  
@@ -123,8 +124,8 @@
 +				 * length limit caused us to read right up to the
 +				 * newline ... doing "%*[^\n]\n" wont eat the newline
 +				 */
-+				fscanf (fp, "%*[^\n]");
-+				fscanf (fp, "\n");
++				ignore_value (fscanf (fp, "%*[^\n]"));
++				ignore_value (fscanf (fp, "\n"));
 +			}
 +		}
 +		fclose (fp);
@@ -143,7 +144,7 @@
  /* Print ELEMENT, preceded by a space if something has already been
     printed.  */
  
-@@ -250,10 +368,14 @@ main (int argc, char **argv)
+@@ -250,10 +369,14 @@ main (int argc, char **argv)
    if (toprint & PRINT_PROCESSOR)
      {
        char const *element = unknown;
@@ -159,7 +160,7 @@
            element = processor;
        }
  #endif
-@@ -306,9 +428,13 @@ main (int argc, char **argv)
+@@ -306,9 +429,13 @@ main (int argc, char **argv)
        if (element == unknown)
          {
            static char hardware_platform[257];