source: lib/json_util.h @ cad74fb

Last change on this file since cad74fb was 82149f4, checked in by GitHub <noreply@…>, at 2023-03-04T19:59:09Z

Fixes related to external-json-parser (#165)

  • configure: append conditionally json-parser to pc file

json-parser needs to be appended to Requires section of pkg-config file
when bitlbee is configured to use external-json-parser. This change is
needed for external plugins like bitlbee-steam.

  • Makefile: do not install json.h when system json-parser is used

install-dev target should not install bundled json.h when bitlbee is
configured to use external-json-parser.

  • Use correct json.h header file with respect to external_json_parser value

The preprocessor must include correct json.h header file with respect to
external_json_parser value, otherwise function prototypes and other
definitions do not need to correspond with object used for linking.

The state before this commit is that local version lib/json.h is used
always for compilation and external_json_parser variable controls if
local lib/json.o or global libjsonparser.so will be linked.

In order to fix this problem, #include directives in lib/json_util.h and
lib/oauth2.c were changed from "json.h" to <json.h> and preprocessor -I
flags were moved after conditional json-parser flags, which is enough
for solving the issue. Additionally, USE_EXTERNAL_JSON_PARSER macro is
exported when external-json-parser is used and it is used in lib/json.h
to trigger an error message, which should prevent similar mistakes in
future.
  • Property mode set to 100644
File size: 2.1 KB
RevLine 
[c08d201]1/***************************************************************************\
2*                                                                           *
3*  BitlBee - An IRC to IM gateway                                           *
4*  Helper functions for json.c                                              *
5*                                                                           *
[0e788f5]6*  Copyright 2012-2012 Wilmer van der Gaast <wilmer@gaast.net>              *
[c08d201]7*                                                                           *
[4f7255d]8*  This program is free software; you can redistribute it and/or modify     *
9*  it under the terms of the GNU General Public License as published by     *
10*  the Free Software Foundation; either version 2 of the License, or        *
11*  (at your option) any later version.                                      *
[c08d201]12*                                                                           *
[4f7255d]13*  This program is distributed in the hope that it will be useful,          *
[c08d201]14*  but WITHOUT ANY WARRANTY; without even the implied warranty of           *
[4f7255d]15*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            *
16*  GNU General Public License for more details.                             *
[c08d201]17*                                                                           *
[4f7255d]18*  You should have received a copy of the GNU General Public License along  *
19*  with this program; if not, write to the Free Software Foundation, Inc.,  *
20*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.              *
[c08d201]21*                                                                           *
22****************************************************************************/
23
[82149f4]24#include <json.h>
[c08d201]25
[8e3b7ac]26#define JSON_O_FOREACH(o, k, v) \
27        char *k; json_value *v; int __i; \
[5ebff60]28        for (__i = 0; (__i < (o)->u.object.length) && \
29             (k = (o)->u.object.values[__i].name) && \
30             (v = (o)->u.object.values[__i].value); \
31             __i ++)
[8e3b7ac]32
[5ebff60]33json_value *json_o_get(const json_value *obj, const json_char *name);
34const char *json_o_str(const json_value *obj, const json_char *name);
35char *json_o_strdup(const json_value *obj, const json_char *name);
Note: See TracBrowser for help on using the repository browser.