json: update internal type definition to match JSMN

Commit Message

James Prestwood Nov. 2, 2022, 6:46 p.m. UTC

Fixes: ceda955ba7 ("shared: Update JSMN to latest version")
---
 src/json.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

James Prestwood Nov. 2, 2022, 6:50 p.m. UTC | #1

On Wed, 2022-11-02 at 11:46 -0700, James Prestwood wrote:
> Fixes: ceda955ba7 ("shared: Update JSMN to latest version")
> ---
>  src/json.h | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/json.h b/src/json.h
> index c6220667..8cf2ba03 100644
> --- a/src/json.h
> +++ b/src/json.h
> @@ -27,10 +27,10 @@ struct json_iter;
>   */
>  enum json_type {
>         JSON_UNDEFINED = 0,
> -       JSON_OBJECT = 1,
> -       JSON_ARRAY = 2,
> -       JSON_STRING = 3,
> -       JSON_PRIMITIVE = 4
> +       JSON_OBJECT = 1 << 0,
> +       JSON_ARRAY = 1 << 1,
> +       JSON_STRING = 1 << 2,
> +       JSON_PRIMITIVE = 1 << 4,

Whoops, this should be 1 << 3. I can send v2 or just fix this up when
applying?

>  };
>  
>  enum json_flag {

Denis Kenzior Nov. 2, 2022, 8:04 p.m. UTC | #2

Hi James,

On 11/2/22 13:50, James Prestwood wrote:
> On Wed, 2022-11-02 at 11:46 -0700, James Prestwood wrote:
>> Fixes: ceda955ba7 ("shared: Update JSMN to latest version")
>> ---
>>   src/json.h | 8 ++++----
>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>
> 
> Whoops, this should be 1 << 3. I can send v2 or just fix this up when
> applying?
> 

I fixed this up and applied.

Regards,
-Denis

Patch

diff --git a/src/json.h b/src/json.h
index c6220667..8cf2ba03 100644
--- a/src/json.h
+++ b/src/json.h
@@ -27,10 +27,10 @@  struct json_iter;
  */
 enum json_type {
 	JSON_UNDEFINED = 0,
-	JSON_OBJECT = 1,
-	JSON_ARRAY = 2,
-	JSON_STRING = 3,
-	JSON_PRIMITIVE = 4
+	JSON_OBJECT = 1 << 0,
+	JSON_ARRAY = 1 << 1,
+	JSON_STRING = 1 << 2,
+	JSON_PRIMITIVE = 1 << 4,
 };
 
 enum json_flag {