From: Urban Wallasch Date: Mon, 19 Aug 2019 11:54:37 +0000 (+0200) Subject: * Added debug and error logging to tele2json, const'ified argument. X-Git-Tag: v0.1.0~15 X-Git-Url: https://git.packet-gain.de/?a=commitdiff_plain;h=refs%2Fheads%2Frwlock;p=ets2_tele.git * Added debug and error logging to tele2json, const'ified argument. --- diff --git a/tele2json.c b/tele2json.c index 7a40294..f2d011e 100644 --- a/tele2json.c +++ b/tele2json.c @@ -7,13 +7,15 @@ #include "tele2json.h" #include "log.h" -size_t tele2json( char *buf, size_t size, struct telemetry_state_t *tele ) { +size_t tele2json( char *buf, size_t size, const struct telemetry_state_t *tele ) { size_t n = 0; - if ( NULL == tele ) + if ( NULL == tele ) { + EPRINT( "Telemetry pointer is NULL!\n" ); return 0; + } -#define CHKSIZE do{ if ( n >= size ) return 0; }while(0) +#define CHKSIZE do{ if ( n >= size ) { EPRINT("Buffer too small @%u!\n",(unsigned)n); return 0; } }while(0) CHKSIZE; n += snprintf( buf+n, size-n, "{\n" ); CHKSIZE; @@ -75,6 +77,7 @@ size_t tele2json( char *buf, size_t size, struct telemetry_state_t *tele ) { n += snprintf( buf+n, size-n, " \"dummy\": 0\n" ); CHKSIZE; n += snprintf( buf+n, size-n, "}\n" ); CHKSIZE; + DPRINT( "Generated %u bytes of JSON data.\n", (unsigned)n ); return n; #undef CHKSIZE } diff --git a/tele2json.h b/tele2json.h index 38a9f20..b36cc70 100644 --- a/tele2json.h +++ b/tele2json.h @@ -9,7 +9,7 @@ extern "C" { #include "telemetry.h" -extern size_t tele2json( char *buf, size_t size, struct telemetry_state_t *tele ); +extern size_t tele2json( char *buf, size_t size, const struct telemetry_state_t *tele ); #ifdef __cplusplus }