Merge pull request #199 from evanmiller/remove-deprecated

Remove deprecated functions

NEWS

@@ -36,6 +36,10 @@ parameter, so that date formats can be set in a non-global fashion:
 The above function is the most common reason that old projects will fail to
 compile on 0.9, and the fix is straightforward.
 
+The previously-deprecated functions mdb_init() and mdb_exit() have been
+removed. These functions did nothing; any calls to them should be excised with
+prejudice.
+
 This release introduces two new CLI tools (mdb-count and mdb-queries) and
 deprecates mdb-array, mdb-header, and mdb-parsecsv. Several man pages have been
 added or otherwise brought up to date.

include/mdbtools.h

@@ -450,10 +450,6 @@ typedef struct {
 	MdbAny	value;
 } MdbSarg;
 
-/* mem.c */
-extern MDB_DEPRECATED(void, mdb_init(void));
-extern MDB_DEPRECATED(void, mdb_exit(void));
-
 /* version.c */
 const char *mdb_get_version(void);
 
@@ -533,8 +529,6 @@ int mdb_read_row(MdbTableDef *table, unsigned int row);
 void mdb_buffer_dump(const void *buf, off_t start, size_t len);
 
 /* backend.c */
-MDB_DEPRECATED(char*, mdb_get_coltype_string(MdbBackend *backend, int col_type));
-MDB_DEPRECATED(int, mdb_coltype_takes_length(MdbBackend *backend, int col_type));
 void mdb_init_backends(MdbHandle *mdb);
 void mdb_remove_backends(MdbHandle *mdb);
 const MdbBackendType* mdb_get_colbacktype(const MdbColumn *col);

src/libmdb/Makefile.am

@@ -1,5 +1,5 @@
 lib_LTLIBRARIES	=	libmdb.la
-libmdb_la_SOURCES=	catalog.c mem.c file.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c props.c worktable.c options.c iconv.c version.c
+libmdb_la_SOURCES=	catalog.c file.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c props.c worktable.c options.c iconv.c version.c
 libmdb_la_LDFLAGS = -version-info $(VERSION_INFO)
 if FAKE_GLIB
 libmdb_la_SOURCES += fakeglib.c

src/libmdb/mem.c

@@ -1,31 +0,0 @@
-/* MDB Tools - A library for reading MS Access database files
- * Copyright (C) 2000 Brian Bruns
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "mdbtools.h"
-
-MDB_DEPRECATED(void,
-mdb_init())
-{
-	fprintf(stderr, "mdb_init() is DEPRECATED and does nothing. Stop calling it.\n");
-}
-
-MDB_DEPRECATED(void,
-mdb_exit())
-{
-	fprintf(stderr, "mdb_exit() is DEPRECATED and does nothing. Stop calling it.\n");
-}