Automatic date update in version.in

[deliverable/binutils-gdb.git] / gas / depend.c

diff --git a/gas/depend.c b/gas/depend.c
index 4a264aa7038cdc11f4b323e5ea2a922aa43a2b85..873a47a3de147be125a10c11715b029efd52d53c 100644 (file)
--- a/gas/depend.c
+++ b/gas/depend.c
@@ -1,11 +1,11 @@
 /* depend.c - Handle dependency tracking.
 /* depend.c - Handle dependency tracking.

-   Copyright 1997, 1998, 2000, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1997-2019 Free Software Foundation, Inc.

 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -19,15 +19,16 @@
    02110-1301, USA.  */
 
 #include "as.h"
    02110-1301, USA.  */
 
 #include "as.h"

+#include "filenames.h"

 
 /* The file to write to, or NULL if no dependencies being kept.  */
 static char * dep_file = NULL;
 
 struct dependency
 
 /* The file to write to, or NULL if no dependencies being kept.  */
 static char * dep_file = NULL;
 
 struct dependency

-  {
-    char * file;
-    struct dependency * next;
-  };
+{
+  char * file;
+  struct dependency * next;
+};

 
 /* All the files we depend on.  */
 static struct dependency * dep_chain = NULL;
 
 /* All the files we depend on.  */
 static struct dependency * dep_chain = NULL;


@@ -35,8 +36,8 @@ static struct dependency * dep_chain = NULL;
 /* Current column in output file.  */
 static int column = 0;
 
 /* Current column in output file.  */
 static int column = 0;
 

-static int quote_string_for_make (FILE *, char *);
-static void wrap_output (FILE *, char *, int);
+static int quote_string_for_make (FILE *, const char *);
+static void wrap_output (FILE *, const char *, int);

 
 /* Number of columns allowable.  */
 #define MAX_COLUMNS 72
 
 /* Number of columns allowable.  */
 #define MAX_COLUMNS 72


@@ -53,7 +54,7 @@ start_dependencies (char *filename)
 /* Noticed a new filename, so try to register it.  */
 
 void
 /* Noticed a new filename, so try to register it.  */
 
 void

-register_dependency (char *filename)
+register_dependency (const char *filename)

 {
   struct dependency *dep;
 
 {
   struct dependency *dep;
 


@@ -62,11 +63,11 @@ register_dependency (char *filename)
 
   for (dep = dep_chain; dep != NULL; dep = dep->next)
     {
 
   for (dep = dep_chain; dep != NULL; dep = dep->next)
     {

-      if (!strcmp (filename, dep->file))
+      if (!filename_cmp (filename, dep->file))

        return;
     }
 
        return;
     }
 

-  dep = (struct dependency *) xmalloc (sizeof (struct dependency));
+  dep = XNEW (struct dependency);

   dep->file = xstrdup (filename);
   dep->next = dep_chain;
   dep_chain = dep;
   dep->file = xstrdup (filename);
   dep->next = dep_chain;
   dep_chain = dep;


@@ -79,9 +80,9 @@ register_dependency (char *filename)
    This code is taken from gcc with only minor changes.  */
 
 static int
    This code is taken from gcc with only minor changes.  */
 
 static int

-quote_string_for_make (FILE *file, char *src)
+quote_string_for_make (FILE *file, const char *src)

 {
 {

-  char *p = src;
+  const char *p = src;

   int i = 0;
 
   for (;;)
   int i = 0;
 
   for (;;)


@@ -100,7 +101,7 @@ quote_string_for_make (FILE *file, char *src)
               preceded by 2N backslashes represents N backslashes at
               the end of a file name; and backslashes in other
               contexts should not be doubled.  */
               preceded by 2N backslashes represents N backslashes at
               the end of a file name; and backslashes in other
               contexts should not be doubled.  */

-           char *q;
+           const char *q;

 
            for (q = p - 1; src < q && q[-1] == '\\'; q--)
              {
 
            for (q = p - 1; src < q && q[-1] == '\\'; q--)
              {


@@ -120,8 +121,8 @@ quote_string_for_make (FILE *file, char *src)
          if (file)
            putc (c, file);
          i++;
          if (file)
            putc (c, file);
          i++;

-         /* Fall through.  This can mishandle things like "$(" but
-            there's no easy fix.  */
+         /* Fall through.  */
+         /* This can mishandle things like "$(" but there's no easy fix.  */

        default:
        ordinary_char:
          /* This can mishandle characters in the string "\0\n%*?[\\~";
        default:
        ordinary_char:
          /* This can mishandle characters in the string "\0\n%*?[\\~";


@@ -141,7 +142,7 @@ quote_string_for_make (FILE *file, char *src)
    wrapping as necessary.  */
 
 static void
    wrapping as necessary.  */
 
 static void

-wrap_output (FILE *f, char *string, int spacer)
+wrap_output (FILE *f, const char *string, int spacer)

 {
   int len = quote_string_for_make (NULL, string);
 
 {
   int len = quote_string_for_make (NULL, string);