PR 43839

[pf3gnuchains/gcc-fork.git] / libgfortran / io / fbuf.c

diff --git a/libgfortran/io/fbuf.c b/libgfortran/io/fbuf.c
index a496365..82b3f6b 100644 (file)
--- a/libgfortran/io/fbuf.c
+++ b/libgfortran/io/fbuf.c
@@ -1,34 +1,31 @@
-/* Copyright (C) 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
    Contributed by Janne Blomqvist
 
 This file is part of the GNU Fortran runtime library (libgfortran).
 
 Libgfortran 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.
 
-In addition to the permissions in the GNU General Public License, the
-Free Software Foundation gives you unlimited permission to link the
-compiled version of this file into combinations with other programs,
-and to distribute those combinations without any restriction coming
-from the use of this file.  (The General Public License restrictions
-do apply in other respects; for example, they cover modification of
-the file, and distribution when not linked into a combine
-executable.)
-
 Libgfortran is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with Libgfortran; see the file COPYING.  If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
 
 
 #include "io.h"
+#include "fbuf.h"
+#include "unix.h"
 #include <string.h>
 #include <stdlib.h>
 
@@ -42,7 +39,7 @@ fbuf_init (gfc_unit * u, int len)
   if (len == 0)
     len = 512;                 /* Default size.  */
 
-  u->fbuf = get_mem (sizeof (fbuf));
+  u->fbuf = get_mem (sizeof (struct fbuf));
   u->fbuf->buf = get_mem (len);
   u->fbuf->len = len;
   u->fbuf->act = u->fbuf->pos = 0;
@@ -55,8 +52,8 @@ fbuf_destroy (gfc_unit * u)
   if (u->fbuf == NULL)
     return;
   if (u->fbuf->buf)
-    free_mem (u->fbuf->buf);
-  free_mem (u->fbuf);
+    free (u->fbuf->buf);
+  free (u->fbuf);
   u->fbuf = NULL;
 }