build: re-enable compiler warnings, and fix them

[bison.git] / src / location.c

diff --git a/src/location.c b/src/location.c
index d06f4faea24b00e30ba5095f12f17c90a4ad62ba..4fb55934512d53d5d5d69c8bdbf30e2877eae661 100644 (file)
--- a/src/location.c
+++ b/src/location.c
@@ -1,6 +1,6 @@
 /* Locations for Bison
 
 /* Locations for Bison
 

-   Copyright (C) 2002, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2015 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -96,10 +96,8 @@ location_compute (location *loc, boundary *cur, char const *token, size_t size)
 }
 
 
 }
 
 

-/* Output to OUT the location LOC.
-   Warning: it uses quotearg's slot 3.  */

 unsigned
 unsigned

-location_print (FILE *out, location loc)
+location_print (location loc, FILE *out)

 {
   unsigned res = 0;
   int end_col = 0 != loc.end.column ? loc.end.column - 1 : 0;
 {
   unsigned res = 0;
   int end_col = 0 != loc.end.column ? loc.end.column - 1 : 0;


@@ -161,7 +159,7 @@ cleanup_caret ()
 }
 
 void
 }
 
 void

-location_caret (FILE *out, location loc)
+location_caret (location loc, FILE *out)

 {
   /* FIXME: find a way to support multifile locations, and only open once each
      file. That would make the procedure future-proof.  */
 {
   /* FIXME: find a way to support multifile locations, and only open once each
      file. That would make the procedure future-proof.  */


@@ -190,7 +188,7 @@ location_caret (FILE *out, location loc)
   /* Read the actual line.  Don't update the offset, so that we keep a pointer
      to the start of the line.  */
   {
   /* Read the actual line.  Don't update the offset, so that we keep a pointer
      to the start of the line.  */
   {

-    char c = getc (caret_info.source);
+    int c = getc (caret_info.source);

     if (c != EOF)
       {
         /* Quote the file, indent by a single column.  */
     if (c != EOF)
       {
         /* Quote the file, indent by a single column.  */


@@ -221,7 +219,7 @@ void
 boundary_set_from_string (boundary *bound, char *loc_str)
 {
   /* Must search in reverse since the file name field may
 boundary_set_from_string (boundary *bound, char *loc_str)
 {
   /* Must search in reverse since the file name field may

-   * contain `.' or `:'.  */
+   * contain '.' or ':'.  */

   char *delim = strrchr (loc_str, '.');
   aver (delim);
   *delim = '\0';
   char *delim = strrchr (loc_str, '.');
   aver (delim);
   *delim = '\0';