From: Zbigniew Jędrzejewski-Szmek Date: Fri, 6 May 2022 12:37:01 +0000 (+0200) Subject: shared/json: disentangle flag mixup X-Git-Tag: v251-rc3~47 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=680f2fb39d0215a7772d13cf04a11e6bc3263676;p=thirdparty%2Fsystemd.git shared/json: disentangle flag mixup _DEBUG and _RELAX had the same value… I'm not sure what the effect of this is. --- diff --git a/src/shared/json.h b/src/shared/json.h index 8760354b661..91d02a911e1 100644 --- a/src/shared/json.h +++ b/src/shared/json.h @@ -331,9 +331,9 @@ typedef enum JsonDispatchFlags { JSON_SAFE = 1 << 3, /* Don't accept "unsafe" strings in json_dispatch_string() + json_dispatch_string() */ JSON_RELAX = 1 << 4, /* Use relaxed user name checking in json_dispatch_user_group_name */ - /* The following two may be passed into log_json() in addition to the three above */ - JSON_DEBUG = 1 << 4, /* Indicates that this log message is a debug message */ - JSON_WARNING = 1 << 5, /* Indicates that this log message is a warning message */ + /* The following two may be passed into log_json() in addition to those above */ + JSON_DEBUG = 1 << 5, /* Indicates that this log message is a debug message */ + JSON_WARNING = 1 << 6, /* Indicates that this log message is a warning message */ } JsonDispatchFlags; typedef int (*JsonDispatchCallback)(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata);