mirror of
https://github.com/json-c/json-c.git
synced 2026-04-04 12:59:07 +08:00
Remove the previously deprecated bits.h and the lh_abort() function.
This commit is contained in:
@@ -2,7 +2,10 @@
|
|||||||
Next version, 0.14
|
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)
|
0.13 (up to commit 5dae561, 2017/11/29)
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ pkgconfig_DATA = json-c.pc
|
|||||||
libjson_cincludedir = $(includedir)/json-c
|
libjson_cincludedir = $(includedir)/json-c
|
||||||
libjson_cinclude_HEADERS = \
|
libjson_cinclude_HEADERS = \
|
||||||
arraylist.h \
|
arraylist.h \
|
||||||
bits.h \
|
|
||||||
debug.h \
|
debug.h \
|
||||||
json.h \
|
json.h \
|
||||||
json_c_version.h \
|
json_c_version.h \
|
||||||
|
|||||||
36
bits.h
36
bits.h
@@ -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
|
|
||||||
@@ -52,15 +52,6 @@ json_global_set_string_hash(const int h)
|
|||||||
return 0;
|
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)
|
static unsigned long lh_ptr_hash(const void *k)
|
||||||
{
|
{
|
||||||
/* CAW: refactored to be 64bit nice */
|
/* CAW: refactored to be 64bit nice */
|
||||||
|
|||||||
15
linkhash.h
15
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);
|
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.
|
* Resizes the specified table.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user