Browse Source

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

tags/json-c-0.14-20200419
Eric Haszlakiewicz 7 years ago
parent
commit
f83cf244cd
5 changed files with 4 additions and 62 deletions
  1. +4
    -1
      ChangeLog
  2. +0
    -1
      Makefile.am
  3. +0
    -36
      bits.h
  4. +0
    -9
      linkhash.c
  5. +0
    -15
      linkhash.h

+ 4
- 1
ChangeLog View File

@@ -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)


+ 0
- 1
Makefile.am View File

@@ -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 \


+ 0
- 36
bits.h View File

@@ -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

+ 0
- 9
linkhash.c View File

@@ -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 */


+ 0
- 15
linkhash.h View File

@@ -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.
*


Loading…
Cancel
Save