From 4158fdbea7da5a7c7efb182b69707c78f35a398f Mon Sep 17 00:00:00 2001 From: Cristian Pop Date: Thu, 24 Feb 2022 11:22:46 -0800 Subject: [PATCH] 1.3.1: Fixes size_t conversion on x64 systems. Excluding build/ in .gitignore. (#177) * Fixing size_t conversion on x64 systems. Excluding build/ in .gitignore. * 1.3.1: Increments version. Co-authored-by: Krzysztof Gabis --- .gitignore | 1 + CMakeLists.txt | 2 +- package.json | 2 +- parson.c | 6 +++--- parson.h | 6 +++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ccf4f25..ea09d48 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ testcpp tests/test_2_serialized.txt tests/test_2_serialized_pretty.txt test_hash_collisions +build/** diff --git a/CMakeLists.txt b/CMakeLists.txt index 6945b44..4e1cf6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(parson C) include (GNUInstallDirs) -set(PARSON_VERSION 1.3.0) +set(PARSON_VERSION 1.3.1) add_library(parson parson.c) target_include_directories(parson PUBLIC $) diff --git a/package.json b/package.json index 5d0b930..62fd31e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "parson", - "version": "1.3.0", + "version": "1.3.1", "repo": "kgabis/parson", "description": "Small json parser and reader", "keywords": [ "json", "parser" ], diff --git a/parson.c b/parson.c index 8406aab..5a78118 100644 --- a/parson.c +++ b/parson.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: MIT - Parson 1.3.0 (https://github.com/kgabis/parson) + Parson 1.3.1 (https://github.com/kgabis/parson) Copyright (c) 2012 - 2022 Krzysztof Gabis Permission is hereby granted, free of charge, to any person obtaining a copy @@ -32,7 +32,7 @@ #define PARSON_IMPL_VERSION_MAJOR 1 #define PARSON_IMPL_VERSION_MINOR 3 -#define PARSON_IMPL_VERSION_PATCH 0 +#define PARSON_IMPL_VERSION_PATCH 1 #if (PARSON_VERSION_MAJOR != PARSON_IMPL_VERSION_MAJOR)\ || (PARSON_VERSION_MINOR != PARSON_IMPL_VERSION_MINOR)\ @@ -596,7 +596,7 @@ static JSON_Status json_object_add(JSON_Object *object, char *name, JSON_Value * static JSON_Value * json_object_getn_value(const JSON_Object *object, const char *name, size_t name_len) { unsigned long hash = 0; parson_bool_t found = PARSON_FALSE; - unsigned long cell_ix = 0; + size_t cell_ix = 0; size_t item_ix = 0; if (!object || !name) { return NULL; diff --git a/parson.h b/parson.h index 7bbfa52..bba4659 100644 --- a/parson.h +++ b/parson.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: MIT - Parson 1.3.0 (https://github.com/kgabis/parson) + Parson 1.3.1 (https://github.com/kgabis/parson) Copyright (c) 2012 - 2022 Krzysztof Gabis Permission is hereby granted, free of charge, to any person obtaining a copy @@ -36,9 +36,9 @@ extern "C" #define PARSON_VERSION_MAJOR 1 #define PARSON_VERSION_MINOR 3 -#define PARSON_VERSION_PATCH 0 +#define PARSON_VERSION_PATCH 1 -#define PARSON_VERSION_STRING "1.3.0" +#define PARSON_VERSION_STRING "1.3.1" #include /* size_t */