[BACK]Return to ajson.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libelwix / inc / elwix

Diff for /libelwix/inc/elwix/ajson.h between versions 1.7.60.1 and 1.10

version 1.7.60.1, 2024/12/04 17:46:50 version 1.10, 2025/08/25 13:00:37
Line 12  terms: Line 12  terms:
 All of the documentation and software included in the ELWIX and AITNET  All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>  Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
   
Copyright 2004 - 2024Copyright 2004 - 2025
         by Michael Pounov <misho@elwix.org>.  All rights reserved.          by Michael Pounov <misho@elwix.org>.  All rights reserved.
   
 Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
Line 89  typedef struct _tagToken { Line 89  typedef struct _tagToken {
 #define json_tokstrcpy(d, j, x) { strncpy((d), json_tokstr((j), (x)), json_toklen(x)); \  #define json_tokstrcpy(d, j, x) { strncpy((d), json_tokstr((j), (x)), json_toklen(x)); \
                                         (d)[json_toklen(x)] = 0; }                                           (d)[json_toklen(x)] = 0; } 
   
   #ifdef __cplusplus
   extern "C" {
   #endif
   
 /*  /*
  * json_init() - Initialize JSON handler   * json_init() - Initialize JSON handler
Line 163  double json_token2dbl(const char *jstr, jtok_t * __res Line 166  double json_token2dbl(const char *jstr, jtok_t * __res
  */   */
 int json_token2bool(const char *jstr, jtok_t * __restrict tok);  int json_token2bool(const char *jstr, jtok_t * __restrict tok);
 /*  /*
 * json_token2array() - Convert token to string array * json_token2vars() - Convert token to string variable array
  *   *
  * @jstr = JSON string   * @jstr = JSON string
  * @tok = Token for convert   * @tok = Token for convert
  * return: =NULL error or !=NULL allocated array with string variables,    * return: =NULL error or !=NULL allocated array with string variables, 
  *              after use should be ait_freeVars()   *              after use should be ait_freeVars()
  */   */
   array_t *json_token2vars(const char *jstr, jtok_t * __restrict tok);
   /*
    * json_token2array() - Convert token to string array
    *
    * @jstr = JSON string
    * @tok = Token for convert
    * return: =NULL error or !=NULL allocated array with strings, 
    *              after use should be json_freearray()
    */
 array_t *json_token2array(const char *jstr, jtok_t * __restrict tok);  array_t *json_token2array(const char *jstr, jtok_t * __restrict tok);
   /*
    * json_freearray() - Free & destroy allocated array from json_token2array function
    *
    * @parr = Array
    * return -1 error or 0 ok
    */
   int json_freearray(array_t **parr);
   
   
 /*  /*
  * json_findbykey() - Find token data by key   * json_findbykey() - Find token data by key
  *   *
Line 216  jtok_t *json_findbypos(unsigned long pos, jtok_t * __r Line 236  jtok_t *json_findbypos(unsigned long pos, jtok_t * __r
  * return: -1 on error or >=0 scope of object   * return: -1 on error or >=0 scope of object
  */   */
 long json_objscope(const char *key, const char *jstr, jtok_t * __restrict toks, int toksnum);  long json_objscope(const char *key, const char *jstr, jtok_t * __restrict toks, int toksnum);
   /*
    * json_validate() - Validate JSON
    *
    * @jstr = JSON string
    * @started = if started != NULL then here will return start position of found JSON
    * return: -1 error or >=0 where valid JSON ends
    */
   int json_validate(const char *jstr, int *started);
   /*
    * json_marshaling() - Prepare JSON to one continues line
    *
    * @jstr = JSON string
    * @space = if it is 0 then spaces will be removed
    * return NULL error or !=NULL ready JSON for proceeding
    */
   char *json_marshaling(char * __restrict jstr, int space);
   
   
 /*  /*
Line 361  int json_add_pair2(char * __restrict jstr, int jlen, i Line 397  int json_add_pair2(char * __restrict jstr, int jlen, i
 int json_add_array(char * __restrict jstr, int jlen, int wspace,   int json_add_array(char * __restrict jstr, int jlen, int wspace, 
                 array_t * __restrict arr);                  array_t * __restrict arr);
   
   #ifdef __cplusplus
   }
   #endif
   
 #endif  #endif
Removed from v.1.7.60.1  
changed lines
  Added in v.1.10

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>