pspp-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[formatting i18n 06/14] legacy-encoding: Remove.


From: Ben Pfaff
Subject: [formatting i18n 06/14] legacy-encoding: Remove.
Date: Sat, 19 Feb 2011 17:42:18 -0800

The functions in this module are no longer used.
---
 src/data/data-in.c                 |    1 -
 src/data/data-in.h                 |    3 +-
 src/data/data-out.h                |    3 +-
 src/data/file-handle-def.h         |    3 +-
 src/language/data-io/data-reader.h |    3 +-
 src/libpspp/automake.mk            |    2 -
 src/libpspp/legacy-encoding.c      |   41 ------------------------------------
 src/libpspp/legacy-encoding.h      |   25 ----------------------
 8 files changed, 4 insertions(+), 77 deletions(-)
 delete mode 100644 src/libpspp/legacy-encoding.c
 delete mode 100644 src/libpspp/legacy-encoding.h

diff --git a/src/data/data-in.c b/src/data/data-in.c
index 03b25fe..b6fa516 100644
--- a/src/data/data-in.c
+++ b/src/data/data-in.c
@@ -37,7 +37,6 @@
 #include "libpspp/compiler.h"
 #include "libpspp/i18n.h"
 #include "libpspp/integer-format.h"
-#include "libpspp/legacy-encoding.h"
 #include "libpspp/misc.h"
 #include "libpspp/str.h"
 #include "settings.h"
diff --git a/src/data/data-in.h b/src/data/data-in.h
index ceb023e..452b142 100644
--- a/src/data/data-in.h
+++ b/src/data/data-in.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 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
@@ -19,7 +19,6 @@
 
 #include <stdbool.h>
 #include "data/format.h"
-#include "libpspp/legacy-encoding.h"
 #include "libpspp/str.h"
 
 union value;
diff --git a/src/data/data-out.h b/src/data/data-out.h
index 735679b..3921773 100644
--- a/src/data/data-out.h
+++ b/src/data/data-out.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2011 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
@@ -20,7 +20,6 @@
 #include <stdbool.h>
 #include <libpspp/float-format.h>
 #include <libpspp/integer-format.h>
-#include <libpspp/legacy-encoding.h>
 
 struct fmt_spec;
 union value;
diff --git a/src/data/file-handle-def.h b/src/data/file-handle-def.h
index b4a6d61..2df85f9 100644
--- a/src/data/file-handle-def.h
+++ b/src/data/file-handle-def.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2005, 2006, 2011 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
@@ -19,7 +19,6 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <libpspp/legacy-encoding.h>
 
 /* What a file handle refers to.
    (Ordinarily only a single value is allowed, but fh_open()
diff --git a/src/language/data-io/data-reader.h 
b/src/language/data-io/data-reader.h
index 7f7355d..affff78 100644
--- a/src/language/data-io/data-reader.h
+++ b/src/language/data-io/data-reader.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 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
@@ -25,7 +25,6 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <libpspp/legacy-encoding.h>
 
 struct file_handle;
 struct string;
diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index de7912b..823bbb3 100644
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -44,8 +44,6 @@ src_libpspp_libpspp_la_SOURCES = \
        src/libpspp/integer-format.h \
        src/libpspp/intern.c \
        src/libpspp/intern.h \
-       src/libpspp/legacy-encoding.c \
-       src/libpspp/legacy-encoding.h \
        src/libpspp/ll.c \
        src/libpspp/ll.h \
        src/libpspp/llx.c \
diff --git a/src/libpspp/legacy-encoding.c b/src/libpspp/legacy-encoding.c
deleted file mode 100644
index bbbf8a2..0000000
--- a/src/libpspp/legacy-encoding.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2011 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 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.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#include <libpspp/legacy-encoding.h>
-#include <libpspp/i18n.h>
-#include <stdlib.h>
-
-char
-legacy_to_native (const char *from, char c)
-{
-  char x;
-  char *s = recode_string (C_ENCODING, from, &c, 1);
-  x = s[0];
-  free (s);
-  return x;
-}
-
-char
-legacy_from_native (const char *to, char c)
-{
-  char x;
-  char *s = recode_string (to, C_ENCODING, &c, 1);
-  x = s[0];
-  free (s);
-  return x;
-}
diff --git a/src/libpspp/legacy-encoding.h b/src/libpspp/legacy-encoding.h
deleted file mode 100644
index 560cbf8..0000000
--- a/src/libpspp/legacy-encoding.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2011 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 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.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef LIBPSPP_LEGACY_ENCODING
-#define LIBPSPP_LEGACY_ENCODING 1
-
-#include <libpspp/compiler.h>
-
-char legacy_to_native (const char *from, char) PURE_FUNCTION;
-char legacy_from_native (const char *to, char) PURE_FUNCTION;
-
-#endif /* libpspp/legacy-encoding.h */
-- 
1.7.2.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]