projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge from gcc
[deliverable/binutils-gdb.git]
/
gas
/
depend.c
diff --git
a/gas/depend.c
b/gas/depend.c
index f17c7c8e3a06fe7621a32012321652c43a00230f..127c819180d79a6e9d0e39ec4cd47ea949c04bf4 100644
(file)
--- a/
gas/depend.c
+++ b/
gas/depend.c
@@
-1,5
+1,5
@@
/* depend.c - Handle dependency tracking.
/* depend.c - Handle dependency tracking.
- Copyright
(C) 1997, 1998
Free Software Foundation, Inc.
+ Copyright
1997, 1998, 2000, 2001
Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
This file is part of GAS, the GNU Assembler.
@@
-21,34
+21,31
@@
#include "as.h"
/* The file to write to, or NULL if no dependencies being kept. */
#include "as.h"
/* The file to write to, or NULL if no dependencies being kept. */
-static char *dep_file = NULL;
+static char *
dep_file = NULL;
struct dependency
struct dependency
-{
-
char *
file;
-
struct dependency *
next;
-};
+
{
+
char *
file;
+
struct dependency *
next;
+
};
/* All the files we depend on. */
/* All the files we depend on. */
-static struct dependency *dep_chain = NULL;
+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
PARAMS ((FILE *, char *)
);
-static void wrap_output
PARAMS ((FILE *, char *, int)
);
+static int quote_string_for_make
(FILE *, char *
);
+static void wrap_output
(FILE *, char *, int
);
/* Number of columns allowable. */
#define MAX_COLUMNS 72
/* Number of columns allowable. */
#define MAX_COLUMNS 72
-
\f
\f
-
/* Start saving dependencies, to be written to FILENAME. If this is
never called, then dependency tracking is simply skipped. */
void
/* Start saving dependencies, to be written to FILENAME. If this is
never called, then dependency tracking is simply skipped. */
void
-start_dependencies (filename)
- char *filename;
+start_dependencies (char *filename)
{
dep_file = filename;
}
{
dep_file = filename;
}
@@
-56,8
+53,7
@@
start_dependencies (filename)
/* Noticed a new filename, so try to register it. */
void
/* Noticed a new filename, so try to register it. */
void
-register_dependency (filename)
- char *filename;
+register_dependency (char *filename)
{
struct dependency *dep;
{
struct dependency *dep;
@@
-66,7
+62,7
@@
register_dependency (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 (!strcmp (filename, dep->file))
return;
}
return;
}
@@
-83,15
+79,15
@@
register_dependency (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, src)
- FILE *file;
- char *src;
+quote_string_for_make (FILE *file, char *src)
{
char *p = src;
int i = 0;
{
char *p = src;
int i = 0;
+
for (;;)
{
char c = *p++;
for (;;)
{
char c = *p++;
+
switch (c)
{
case '\0':
switch (c)
{
case '\0':
@@
-105,7
+101,8
@@
quote_string_for_make (file, src)
the end of a file name; and backslashes in other
contexts should not be doubled. */
char *q;
the end of a file name; and backslashes in other
contexts should not be doubled. */
char *q;
- for (q = p - 1; src < q && q[-1] == '\\'; q--)
+
+ for (q = p - 1; src < q && q[-1] == '\\'; q--)
{
if (file)
putc ('\\', file);
{
if (file)
putc ('\\', file);
@@
-118,7
+115,7
@@
quote_string_for_make (file, src)
putc ('\\', file);
i++;
goto ordinary_char;
putc ('\\', file);
i++;
goto ordinary_char;
-
+
case '$':
if (file)
putc (c, file);
case '$':
if (file)
putc (c, file);
@@
-144,17
+141,18
@@
quote_string_for_make (file, src)
wrapping as necessary. */
static void
wrapping as necessary. */
static void
-wrap_output (f, string, spacer)
- FILE *f;
- char *string;
- int spacer;
+wrap_output (FILE *f, char *string, int spacer)
{
int len = quote_string_for_make (NULL, string);
if (len == 0)
return;
{
int len = quote_string_for_make (NULL, string);
if (len == 0)
return;
- if (column && MAX_COLUMNS - 1 /*spacer*/ - 2 /*` \'*/ < column + len)
+ if (column
+ && (MAX_COLUMNS
+ - 1 /* spacer */
+ - 2 /* ` \' */
+ < column + len))
{
fprintf (f, " \\\n ");
column = 0;
{
fprintf (f, " \\\n ");
column = 0;
@@
-181,7
+179,7
@@
wrap_output (f, string, spacer)
/* Print dependency file. */
void
/* Print dependency file. */
void
-print_dependencies ()
+print_dependencies (
void
)
{
FILE *f;
struct dependency *dep;
{
FILE *f;
struct dependency *dep;
@@
-189,10
+187,10
@@
print_dependencies ()
if (dep_file == NULL)
return;
if (dep_file == NULL)
return;
- f = fopen (dep_file,
"w"
);
+ f = fopen (dep_file,
FOPEN_WT
);
if (f == NULL)
{
if (f == NULL)
{
- as_warn (_("
C
an't open `%s' for writing"), dep_file);
+ as_warn (_("
c
an't open `%s' for writing"), dep_file);
return;
}
return;
}
@@
-204,5
+202,5
@@
print_dependencies ()
putc ('\n', f);
if (fclose (f))
putc ('\n', f);
if (fclose (f))
- as_warn (_("
C
an't close `%s'"), dep_file);
+ as_warn (_("
c
an't close `%s'"), dep_file);
}
}
This page took
0.026561 seconds
and
4
git commands to generate.