git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gcov-io.c (gcov_open): Fix documentation. 

* gcov-io.c (gcov_open): Fix documentation.  Simplify setting
	gcov_var.mode.  Remove unnecessary fstat.

From-SVN: r241136
This commit is contained in:
Nathan Sidwell 2016-10-13 18:36:31 +00:00 committed by Nathan Sidwell
parent 7dca85bf15
commit fc0911e0b8
2 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2016-10-13 Nathan Sidwell <nathan@acm.org>
* gcov-io.c (gcov_open): Fix documentation. Simplify setting
gcov_var.mode. Remove unnecessary fstat.
2016-10-13 Segher Boessenkool <segher@kernel.crashing.org> 2016-10-13 Segher Boessenkool <segher@kernel.crashing.org>
PR bootstrap/77962 PR bootstrap/77962

49
gcc/gcov-io.c
View File

@ -115,10 +115,9 @@ static inline gcov_unsigned_t from_file (gcov_unsigned_t value)
opened. If MODE is >= 0 an existing file will be opened, if opened. If MODE is >= 0 an existing file will be opened, if
possible, and if MODE is <= 0, a new file will be created. Use possible, and if MODE is <= 0, a new file will be created. Use
MODE=0 to attempt to reopen an existing file and then fall back on MODE=0 to attempt to reopen an existing file and then fall back on
creating a new one. If MODE < 0, the file will be opened in creating a new one. If MODE > 0, the file will be opened in
read-only mode. Otherwise it will be opened for modification. read-only mode. Otherwise it will be opened for modification.
Return zero on failure, >0 on opening an existing file and <0 on Return zero on failure, non-zero on success. */
creating a new one. */
GCOV_LINKAGE int GCOV_LINKAGE int
#if IN_LIBGCOV #if IN_LIBGCOV
@ -156,17 +155,12 @@ gcov_open (const char *name, int mode)
/* pass mode (ignored) for compatibility */ /* pass mode (ignored) for compatibility */
fd = open (name, O_RDONLY, S_IRUSR | S_IWUSR); fd = open (name, O_RDONLY, S_IRUSR | S_IWUSR);
} }
else if (mode < 0) else
{ {
/* Write mode - acquire a write-lock. */ /* Write mode - acquire a write-lock. */
s_flock.l_type = F_WRLCK; s_flock.l_type = F_WRLCK;
fd = open (name, O_RDWR | O_CREAT | O_TRUNC, 0666); /* Truncate if force new mode. */
} fd = open (name, O_RDWR | O_CREAT | (mode < 0 ? O_TRUNC : 0), 0666);
else /* mode == 0 */
{
/* Read-Write mode - acquire a write-lock. */
s_flock.l_type = F_WRLCK;
fd = open (name, O_RDWR | O_CREAT, 0666);
} }
if (fd < 0) if (fd < 0)
return 0; return 0;
@ -181,42 +175,23 @@ gcov_open (const char *name, int mode)
close (fd); close (fd);
return 0; return 0;
} }
if (mode > 0)
gcov_var.mode = 1;
else if (mode == 0)
{
struct stat st;
if (fstat (fd, &st) < 0)
{
fclose (gcov_var.file);
gcov_var.file = 0;
return 0;
}
if (st.st_size != 0)
gcov_var.mode = 1;
else
gcov_var.mode = mode * 2 + 1;
}
else
gcov_var.mode = mode * 2 + 1;
#else #else
if (mode >= 0) if (mode >= 0)
/* Open an existing file. */
gcov_var.file = fopen (name, (mode > 0) ? "rb" : "r+b"); gcov_var.file = fopen (name, (mode > 0) ? "rb" : "r+b");
if (gcov_var.file) if (gcov_var.file)
gcov_var.mode = 1; mode = 1;
else if (mode <= 0) else if (mode <= 0)
{ /* Create a new file. */
gcov_var.file = fopen (name, "w+b"); gcov_var.file = fopen (name, "w+b");
if (gcov_var.file)
gcov_var.mode = mode * 2 + 1;
}
if (!gcov_var.file) if (!gcov_var.file)
return 0; return 0;
#endif #endif
gcov_var.mode = mode ? mode : 1;
setbuf (gcov_var.file, (char *)0); setbuf (gcov_var.file, (char *)0);
return 1; return 1;