Patchwork [libfortran,committed] Remove prot from struct unix_stream

login
register
mail settings
Submitter Janne Blomqvist
Date Nov. 3, 2010, 11:10 p.m.
Message ID <AANLkTin6ofqSFGOf_Fq1w3K8cn1x54RSPGHH+WcjPF3-@mail.gmail.com>
Download mbox | patch
Permalink /patch/70087/
State New
Headers show

Comments

Janne Blomqvist - Nov. 3, 2010, 11:10 p.m.
Hi,

some more janitorial work committed as obvious. The prot stuff is
leftover junk from the time when libgfortran used mmap(), it is not
used anymore for a long time.

2010-11-04  Janne Blomqvist  <jb@gcc.gnu.org>

	* io/unix.h (struct unix_stream): Remove prot member.
	* io/unix.c: Remove PROT_READ and PROT_WRITE constants.
	(fd_to_stream): Remove prot from argument list, don't set prot.
	(open_external): Don't set prot flag.
	(input_stream): Remove prot from argument list.
	(output_stream): Likewise.
	(error_stream): Likewise.

Patch

diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c
index a2903af..cf33aec 100644
--- a/libgfortran/io/unix.c
+++ b/libgfortran/io/unix.c
@@ -104,14 +104,6 @@  typedef struct stat gfstat_t;
 #define PATH_MAX 1024
 #endif
 
-#ifndef PROT_READ
-#define PROT_READ 1
-#endif
-
-#ifndef PROT_WRITE
-#define PROT_WRITE 2
-#endif
-
 /* These flags aren't defined on all targets (mingw32), so provide them
    here.  */
 #ifndef S_IRGRP
@@ -919,7 +911,7 @@  open_internal4 (char *base, int length, gfc_offset offset)
  * around it. */
 
 static stream *
-fd_to_stream (int fd, int prot)
+fd_to_stream (int fd)
 {
   gfstat_t statbuf;
   unix_stream *s;
@@ -931,7 +923,6 @@  fd_to_stream (int fd, int prot)
   s->buffer_offset = 0;
   s->physical_offset = 0;
   s->logical_offset = 0;
-  s->prot = prot;
 
   /* Get the current length of the file. */
 
@@ -1231,7 +1222,7 @@  regular_file (st_parameter_open *opp, unit_flags *flags)
 stream *
 open_external (st_parameter_open *opp, unit_flags *flags)
 {
-  int fd, prot;
+  int fd;
 
   if (flags->status == STATUS_SCRATCH)
     {
@@ -1256,25 +1247,7 @@  open_external (st_parameter_open *opp, unit_flags *flags)
     return NULL;
   fd = fix_fd (fd);
 
-  switch (flags->action)
-    {
-    case ACTION_READ:
-      prot = PROT_READ;
-      break;
-
-    case ACTION_WRITE:
-      prot = PROT_WRITE;
-      break;
-
-    case ACTION_READWRITE:
-      prot = PROT_READ | PROT_WRITE;
-      break;
-
-    default:
-      internal_error (&opp->common, "open_external(): Bad action");
-    }
-
-  return fd_to_stream (fd, prot);
+  return fd_to_stream (fd);
 }
 
 
@@ -1284,7 +1257,7 @@  open_external (st_parameter_open *opp, unit_flags *flags)
 stream *
 input_stream (void)
 {
-  return fd_to_stream (STDIN_FILENO, PROT_READ);
+  return fd_to_stream (STDIN_FILENO);
 }
 
 
@@ -1300,7 +1273,7 @@  output_stream (void)
   setmode (STDOUT_FILENO, O_BINARY);
 #endif
 
-  s = fd_to_stream (STDOUT_FILENO, PROT_WRITE);
+  s = fd_to_stream (STDOUT_FILENO);
   return s;
 }
 
@@ -1317,7 +1290,7 @@  error_stream (void)
   setmode (STDERR_FILENO, O_BINARY);
 #endif
 
-  s = fd_to_stream (STDERR_FILENO, PROT_WRITE);
+  s = fd_to_stream (STDERR_FILENO);
   return s;
 }
 
diff --git a/libgfortran/io/unix.h b/libgfortran/io/unix.h
index dc433d7..fe671fa 100644
--- a/libgfortran/io/unix.h
+++ b/libgfortran/io/unix.h
@@ -56,7 +56,6 @@  typedef struct
 
   int active;			/* Length of valid bytes in the buffer */
 
-  int prot;
   int ndirty;			/* Dirty bytes starting at buffer_offset */
 
   int special_file;		/* =1 if the fd refers to a special file */