mirror of https://git.48k.eu/ogserver
constify json parse helper function
json_t * parameter is not modified, constify to allow compiler to spew warnings in case the function tries to modify it.master
parent
88c8b52e88
commit
87774ab087
10
src/json.c
10
src/json.c
|
@ -10,7 +10,7 @@
|
|||
#include "json.h"
|
||||
#include <stdint.h>
|
||||
|
||||
int og_json_parse_string(json_t *element, const char **str)
|
||||
int og_json_parse_string(const json_t *element, const char **str)
|
||||
{
|
||||
if (json_typeof(element) != JSON_STRING)
|
||||
return -1;
|
||||
|
@ -19,7 +19,7 @@ int og_json_parse_string(json_t *element, const char **str)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int og_json_parse_string_copy(json_t *element, char *str, size_t size)
|
||||
int og_json_parse_string_copy(const json_t *element, char *str, size_t size)
|
||||
{
|
||||
const char *reference_str;
|
||||
int err = 0;
|
||||
|
@ -34,7 +34,7 @@ int og_json_parse_string_copy(json_t *element, char *str, size_t size)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int og_json_parse_uint64(json_t *element, uint64_t *integer)
|
||||
int og_json_parse_uint64(const json_t *element, uint64_t *integer)
|
||||
{
|
||||
if (json_typeof(element) != JSON_INTEGER)
|
||||
return -1;
|
||||
|
@ -43,7 +43,7 @@ int og_json_parse_uint64(json_t *element, uint64_t *integer)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int og_json_parse_uint(json_t *element, uint32_t *integer)
|
||||
int og_json_parse_uint(const json_t *element, uint32_t *integer)
|
||||
{
|
||||
if (json_typeof(element) != JSON_INTEGER)
|
||||
return -1;
|
||||
|
@ -52,7 +52,7 @@ int og_json_parse_uint(json_t *element, uint32_t *integer)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int og_json_parse_bool(json_t *element, bool *value)
|
||||
int og_json_parse_bool(const json_t *element, bool *value)
|
||||
{
|
||||
if (json_typeof(element) == JSON_TRUE)
|
||||
*value = true;
|
||||
|
|
10
src/json.h
10
src/json.h
|
@ -4,11 +4,11 @@
|
|||
#include <jansson.h>
|
||||
#include "schedule.h"
|
||||
|
||||
int og_json_parse_string(json_t *element, const char **str);
|
||||
int og_json_parse_string_copy(json_t *element, char *str, size_t size);
|
||||
int og_json_parse_uint64(json_t *element, uint64_t *integer);
|
||||
int og_json_parse_uint(json_t *element, uint32_t *integer);
|
||||
int og_json_parse_bool(json_t *element, bool *value);
|
||||
int og_json_parse_string(const json_t *element, const char **str);
|
||||
int og_json_parse_string_copy(const json_t *element, char *str, size_t size);
|
||||
int og_json_parse_uint64(const json_t *element, uint64_t *integer);
|
||||
int og_json_parse_uint(const json_t *element, uint32_t *integer);
|
||||
int og_json_parse_bool(const json_t *element, bool *value);
|
||||
|
||||
#define OG_PARAM_PART_NUMBER (1UL << 0)
|
||||
#define OG_PARAM_PART_CODE (1UL << 1)
|
||||
|
|
Loading…
Reference in New Issue