Update copyright years.

[thirdparty/gcc.git] / libgfortran / io / intrinsics.c

diff --git a/libgfortran/io/intrinsics.c b/libgfortran/io/intrinsics.c
index 9abadae43739583eb1a69b0a54b49e33fbf3c429..ad7c8003d279f0bbde75df0254125d8c3a49ce1a 100644 (file)
--- a/libgfortran/io/intrinsics.c
+++ b/libgfortran/io/intrinsics.c
@@ -1,7 +1,6 @@
 /* Implementation of the FGET, FGETC, FPUT, FPUTC, FLUSH 
    FTELL, TTYNAM and ISATTY intrinsics.
-   Copyright (C) 2005, 2007, 2009, 2010, 2011, 2012 Free Software
-   Foundation, Inc.
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
 
 This file is part of the GNU Fortran runtime library (libgfortran).
 
@@ -27,7 +26,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #include "io.h"
 #include "fbuf.h"
 #include "unix.h"
-#include <stdlib.h>
 #include <string.h>
 
 
@@ -38,10 +36,10 @@ extern int PREFIX(fgetc) (const int *, char *, gfc_charlen_type);
 export_proto_np(PREFIX(fgetc));
 
 int
-PREFIX(fgetc) (const int * unit, char * c, gfc_charlen_type c_len)
+PREFIX(fgetc) (const int *unit, char *c, gfc_charlen_type c_len)
 {
   int ret;
-  gfc_unit * u = find_unit (*unit);
+  gfc_unit *u = find_unit (*unit);
 
   if (u == NULL)
     return -1;
@@ -72,7 +70,7 @@ PREFIX(fgetc) (const int * unit, char * c, gfc_charlen_type c_len)
     (const int *, char *, GFC_INTEGER_ ## kind *, gfc_charlen_type); \
   export_proto(fgetc_i ## kind ## _sub); \
   void fgetc_i ## kind ## _sub \
-  (const int * unit, char * c, GFC_INTEGER_ ## kind * st, gfc_charlen_type c_len) \
+  (const int *unit, char *c, GFC_INTEGER_ ## kind *st, gfc_charlen_type c_len) \
     { if (st != NULL) \
         *st = PREFIX(fgetc) (unit, c, c_len); \
       else \
@@ -88,7 +86,7 @@ extern int PREFIX(fget) (char *, gfc_charlen_type);
 export_proto_np(PREFIX(fget));
 
 int
-PREFIX(fget) (char * c, gfc_charlen_type c_len)
+PREFIX(fget) (char *c, gfc_charlen_type c_len)
 {
   return PREFIX(fgetc) (&five, c, c_len);
 }
@@ -99,7 +97,7 @@ PREFIX(fget) (char * c, gfc_charlen_type c_len)
     (char *, GFC_INTEGER_ ## kind *, gfc_charlen_type); \
   export_proto(fget_i ## kind ## _sub); \
   void fget_i ## kind ## _sub \
-  (char * c, GFC_INTEGER_ ## kind * st, gfc_charlen_type c_len) \
+  (char *c, GFC_INTEGER_ ## kind *st, gfc_charlen_type c_len) \
     { if (st != NULL) \
         *st = PREFIX(fgetc) (&five, c, c_len); \
       else \
@@ -116,11 +114,11 @@ extern int PREFIX(fputc) (const int *, char *, gfc_charlen_type);
 export_proto_np(PREFIX(fputc));
 
 int
-PREFIX(fputc) (const int * unit, char * c,
+PREFIX(fputc) (const int *unit, char *c,
               gfc_charlen_type c_len __attribute__((unused)))
 {
   ssize_t s;
-  gfc_unit * u = find_unit (*unit);
+  gfc_unit *u = find_unit (*unit);
 
   if (u == NULL)
     return -1;
@@ -145,7 +143,7 @@ PREFIX(fputc) (const int * unit, char * c,
     (const int *, char *, GFC_INTEGER_ ## kind *, gfc_charlen_type); \
   export_proto(fputc_i ## kind ## _sub); \
   void fputc_i ## kind ## _sub \
-  (const int * unit, char * c, GFC_INTEGER_ ## kind * st, gfc_charlen_type c_len) \
+  (const int *unit, char *c, GFC_INTEGER_ ## kind *st, gfc_charlen_type c_len) \
     { if (st != NULL) \
         *st = PREFIX(fputc) (unit, c, c_len); \
       else \
@@ -161,7 +159,7 @@ extern int PREFIX(fput) (char *, gfc_charlen_type);
 export_proto_np(PREFIX(fput));
 
 int
-PREFIX(fput) (char * c, gfc_charlen_type c_len)
+PREFIX(fput) (char *c, gfc_charlen_type c_len)
 {
   return PREFIX(fputc) (&six, c, c_len);
 }
@@ -172,7 +170,7 @@ PREFIX(fput) (char * c, gfc_charlen_type c_len)
     (char *, GFC_INTEGER_ ## kind *, gfc_charlen_type); \
   export_proto(fput_i ## kind ## _sub); \
   void fput_i ## kind ## _sub \
-  (char * c, GFC_INTEGER_ ## kind * st, gfc_charlen_type c_len) \
+  (char *c, GFC_INTEGER_ ## kind *st, gfc_charlen_type c_len) \
     { if (st != NULL) \
         *st = PREFIX(fputc) (&six, c, c_len); \
       else \
@@ -238,9 +236,9 @@ extern void fseek_sub (int *, GFC_IO_INT *, int *, int *);
 export_proto(fseek_sub);
 
 void
-fseek_sub (int * unit, GFC_IO_INT * offset, int * whence, int * status)
+fseek_sub (int *unit, GFC_IO_INT *offset, int *whence, int *status)
 {
-  gfc_unit * u = find_unit (*unit);
+  gfc_unit *u = find_unit (*unit);
   ssize_t result = -1;
 
   if (u != NULL)
@@ -261,7 +259,7 @@ fseek_sub (int * unit, GFC_IO_INT * offset, int * whence, int * status)
 static gfc_offset
 gf_ftell (int unit)
 {
-  gfc_unit * u = find_unit (unit);
+  gfc_unit *u = find_unit (unit);
   if (u == NULL)
     return -1;
   int pos = fbuf_reset (u);
@@ -273,29 +271,11 @@ gf_ftell (int unit)
 }
 
 
-/* Here is the ftell function with an incorrect return type; retained
-   due to ABI compatibility.  */
-
-extern size_t PREFIX(ftell) (int *);
+extern GFC_IO_INT PREFIX(ftell) (int *);
 export_proto_np(PREFIX(ftell));
 
-size_t
-PREFIX(ftell) (int * unit)
-{
-  return gf_ftell (*unit);
-}
-
-
-/* Here is the ftell function with the correct return type, ensuring
-   that large files can be supported as long as the target supports
-   large integers; as of 4.8 the FTELL intrinsic function will call
-   this one instead of the old ftell above.  */
-
-extern GFC_IO_INT PREFIX(ftell2) (int *);
-export_proto_np(PREFIX(ftell2));
-
 GFC_IO_INT
-PREFIX(ftell2) (int * unit)
+PREFIX(ftell) (int *unit)
 {
   return gf_ftell (*unit);
 }
@@ -305,7 +285,7 @@ PREFIX(ftell2) (int * unit)
   extern void ftell_i ## kind ## _sub (int *, GFC_INTEGER_ ## kind *); \
   export_proto(ftell_i ## kind ## _sub); \
   void \
-  ftell_i ## kind ## _sub (int * unit, GFC_INTEGER_ ## kind * offset) \
+  ftell_i ## kind ## _sub (int *unit, GFC_INTEGER_ ## kind *offset) \
   { \
     *offset = gf_ftell (*unit);                        \
   }
@@ -366,7 +346,7 @@ extern void ttynam_sub (int *, char *, gfc_charlen_type);
 export_proto(ttynam_sub);
 
 void
-ttynam_sub (int *unit, char * name, gfc_charlen_type name_len)
+ttynam_sub (int *unit, char *name, gfc_charlen_type name_len)
 {
   gfc_unit *u;
   int nlen;
@@ -393,7 +373,7 @@ extern void ttynam (char **, gfc_charlen_type *, int);
 export_proto(ttynam);
 
 void
-ttynam (char ** name, gfc_charlen_type * name_len, int unit)
+ttynam (char **name, gfc_charlen_type *name_len, int unit)
 {
   gfc_unit *u;