From a64dd8d21e6ef23745187234183b459c46014f76 Mon Sep 17 00:00:00 2001 From: Jakob Olsson <Jakob Olsson> Date: Thu, 28 Nov 2019 17:40:00 +0100 Subject: [PATCH] json-validator: add validate function --- src/json-validator.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/json-validator.h b/src/json-validator.h index 6b3b3f2..e5e27b3 100644 --- a/src/json-validator.h +++ b/src/json-validator.h @@ -12,7 +12,11 @@ enum schema_call_t { int schema_validator_destroy(void); int schema_validator_init(void); +<<<<<<< HEAD bool schema_validator_validate(struct json_object *j_object, char *object, char *method, enum schema_call_t type); +======= +bool schema_validator_validate(struct json_object j_object, char *object, char *method, enum schema_call_t type); +>>>>>>> 62fc741... json-validator: add validate function bool json_object_validate_schema_inject_definitions(struct json_object *j_object, struct json_object *definitions, struct json_object *j_schema); bool json_object_validate_schema(struct json_object *j_obj, struct json_object *j_schema); #ifdef __cplusplus -- GitLab