From f83cf244cd27c7ef06f1852d1f3280fedfb19ae3 Mon Sep 17 00:00:00 2001 From: Eric Haszlakiewicz Date: Sun, 10 Dec 2017 00:25:00 -0500 Subject: [PATCH] Remove the previously deprecated bits.h and the lh_abort() function. --- ChangeLog | 5 ++++- Makefile.am | 1 - bits.h | 36 ------------------------------------ linkhash.c | 9 --------- linkhash.h | 15 --------------- 5 files changed, 4 insertions(+), 62 deletions(-) delete mode 100644 bits.h diff --git a/ChangeLog b/ChangeLog index 75357c1..c7ca51b 100644 --- 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 7e42185..5ad354a 100644 --- 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 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 - * - * 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 5497061..73691cd 100644 --- 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 9c2f5c1..0f0e398 100644 --- 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 stdout, - * then exits the program with an exit code of 1. - * - * @param msg Message format string, like for printf. - * @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. * -- 2.40.0