Change license from GPLv2+ to GPLv3+.

[pspp-builds.git] / src / data / file-handle-def.h

diff --git a/src/data/file-handle-def.h b/src/data/file-handle-def.h
index c5c61ea865a34cc67e8ea56aa473872d31f3fac0..0a79309576e62a4cca91e0189f7d11d73f956aa5 100644 (file)
--- a/src/data/file-handle-def.h
+++ b/src/data/file-handle-def.h
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000, 2005, 2006 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
-   This program 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 of the
-   License, or (at your option) any later version.
+   This program 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 3 of the License, or
+   (at your option) any later version.
 
-   This program 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.
+   This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef FILE_HANDLE_DEF_H
 #define FILE_HANDLE_DEF_H
@@ -41,7 +38,7 @@ enum fh_mode
   };
 
 /* Properties of a file handle. */
-struct fh_properties 
+struct fh_properties
   {
     enum fh_mode mode;          /* File mode. */
     size_t record_width;        /* Length of fixed-format records. */
@@ -53,7 +50,7 @@ void fh_done (void);
 
 /* Creating file handles. */
 struct file_handle *fh_create_file (const char *handle_name,
-                                    const char *filename,
+                                    const char *file_name,
                                     const struct fh_properties *);
 struct file_handle *fh_create_scratch (const char *handle_name);
 const struct fh_properties *fh_default_properties (void);
@@ -62,16 +59,17 @@ const struct fh_properties *fh_default_properties (void);
 void fh_free (struct file_handle *);
 
 /* Finding file handles. */
-struct file_handle *fh_from_name (const char *handle_name);
-struct file_handle *fh_from_filename (const char *filename);
+struct file_handle *fh_from_id (const char *handle_name);
+struct file_handle *fh_from_file_name (const char *file_name);
 struct file_handle *fh_inline_file (void);
 
 /* Generic properties of file handles. */
+const char *fh_get_id (const struct file_handle *);
 const char *fh_get_name (const struct file_handle *);
 enum fh_referent fh_get_referent (const struct file_handle *);
 
 /* Properties of FH_REF_FILE file handles. */
-const char *fh_get_filename (const struct file_handle *);
+const char *fh_get_file_name (const struct file_handle *);
 enum fh_mode fh_get_mode (const struct file_handle *) ;
 
 /* Properties of FH_REF_FILE and FH_REF_INLINE file handles. */