Remove the previously deprecated bits.h and the lh_abort() function.

diff --git a/ChangeLog b/ChangeLog
index 75357c179ab2855415629bda675241328441d626..c7ca51b79f11d9995d1ece61c54bbd666e1ecf59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,10 @@
 Next version, 0.14
 ==================
 
-Nothing yet.
+Deprecated and removed features:
+--------------------------------
+* bits.h has been removed
+* lh_abort() has been removed
 
 
 0.13 (up to commit 5dae561, 2017/11/29)

diff --git a/Makefile.am b/Makefile.am
index 7e42185dd402a2cb0de67c760888991ad1c6dece..5ad354a4a39c5a4a04a0dcb6be497edfc6078dc0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@ pkgconfig_DATA = json-c.pc
 libjson_cincludedir = $(includedir)/json-c
 libjson_cinclude_HEADERS = \
        arraylist.h \
-       bits.h \
        debug.h \
        json.h \
        json_c_version.h \

diff --git a/bits.h b/bits.h
deleted file mode 100644 (file)
index 14c1c13..0000000
--- a/bits.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @file
- * @brief Do not use, only contains deprecated defines.
- * @deprecated Use json_util.h instead.
- *
- * $Id: bits.h,v 1.10 2006/01/30 23:07:57 mclark Exp $
- *
- * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
- * Michael Clark <michael@metaparadigm.com>
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See COPYING for details.
- *
- */
-
-#ifndef _bits_h_
-#define _bits_h_
-
-/**
- * @deprecated
- */
-#define hexdigit(x) (((x) <= '9') ? (x) - '0' : ((x) & 7) + 9)
-/**
- * @deprecated
- */
-#define error_ptr(error) ((void*)error)
-/**
- * @deprecated
- */
-#define error_description(error)  (json_tokener_get_error(error))
-/**
- * @deprecated
- */
-#define is_error(ptr) (ptr == NULL)
-
-#endif

diff --git a/linkhash.c b/linkhash.c
index 5497061a8a15a11ef637377564470a53f3046ad3..73691cd09c12b14de0e7d52d5d3c05f27009a32c 100644 (file)
--- a/linkhash.c
+++ b/linkhash.c
@@ -52,15 +52,6 @@ json_global_set_string_hash(const int h)
        return 0;
 }
 
-void lh_abort(const char *msg, ...)
-{
-       va_list ap;
-       va_start(ap, msg);
-       vprintf(msg, ap);
-       va_end(ap);
-       exit(1);
-}
-
 static unsigned long lh_ptr_hash(const void *k)
 {
        /* CAW: refactored to be 64bit nice */

diff --git a/linkhash.h b/linkhash.h
index 9c2f5c1b2581a63a48c58f20bcc604e62153659f..0f0e398764a4212430e1a86796c00e363c15bc1a 100644 (file)
--- a/linkhash.h
+++ b/linkhash.h
@@ -318,21 +318,6 @@ extern int lh_table_delete(struct lh_table *t, const void *k);
 
 extern int lh_table_length(struct lh_table *t);
 
-/**
- * Prints a message to <code>stdout</code>,
- * then exits the program with an exit code of <code>1</code>.
- *
- * @param msg Message format string, like for <code>printf</code>.
- * @param ... Format args.
- *
- * @deprecated Since it is not a good idea to exit the entire program
- *     because of an internal library failure, json-c will no longer
- *     use this function internally.
- *     However, because its interface is public, it will remain part of
- *     the API on the off chance of legacy software using it externally.
- */
-THIS_FUNCTION_IS_DEPRECATED(void lh_abort(const char *msg, ...));
-
 /**
  * Resizes the specified table.
  *