Change license from GPLv2+ to GPLv3+.

[pspp-builds.git] / src / data / dictionary.c

diff --git a/src/data/dictionary.c b/src/data/dictionary.c
index 34ffc6af541eaccaba3695dc46f1244c07a0254c..d580474edced2e47bf6e4a01424b0a19f19f442c 100644 (file)
--- a/src/data/dictionary.c
+++ b/src/data/dictionary.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc.
 
-   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/>. */
 
 #include <config.h>
 
@@ -1113,7 +1111,7 @@ void
 dict_set_documents (struct dictionary *d, const char *documents)
 {
   size_t remainder;
-  
+
   ds_assign_cstr (&d->documents, documents != NULL ? documents : "");
 
   /* In case the caller didn't get it quite right, pad out the
@@ -1125,7 +1123,7 @@ dict_set_documents (struct dictionary *d, const char *documents)
 
 /* Drops the documents from dictionary D. */
 void
-dict_clear_documents (struct dictionary *d) 
+dict_clear_documents (struct dictionary *d)
 {
   ds_clear (&d->documents);
 }
@@ -1136,10 +1134,10 @@ dict_clear_documents (struct dictionary *d)
 void
 dict_add_document_line (struct dictionary *d, const char *line)
 {
-  if (strlen (line) > DOC_LINE_LENGTH) 
+  if (strlen (line) > DOC_LINE_LENGTH)
     {
       /* Note to translators: "bytes" is correct, not characters */
-      msg (SW, _("Truncating document line to %d bytes."), DOC_LINE_LENGTH); 
+      msg (SW, _("Truncating document line to %d bytes."), DOC_LINE_LENGTH);
     }
   buf_copy_str_rpad (ds_put_uninit (&d->documents, DOC_LINE_LENGTH),
                      DOC_LINE_LENGTH, line);
@@ -1147,7 +1145,7 @@ dict_add_document_line (struct dictionary *d, const char *line)
 
 /* Returns the number of document lines in dictionary D. */
 size_t
-dict_get_document_line_cnt (const struct dictionary *d) 
+dict_get_document_line_cnt (const struct dictionary *d)
 {
   return ds_length (&d->documents) / DOC_LINE_LENGTH;
 }
@@ -1156,7 +1154,7 @@ dict_get_document_line_cnt (const struct dictionary *d)
    LINE, trimming off any trailing white space. */
 void
 dict_get_document_line (const struct dictionary *d,
-                        size_t idx, struct string *line) 
+                        size_t idx, struct string *line)
 {
   assert (idx < dict_get_document_line_cnt (d));
   ds_assign_substring (line, ds_substr (&d->documents, idx * DOC_LINE_LENGTH,