| Message ID | 20180719184111.5129-15-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | monitor: various code simplification and fixes | expand |
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > We can easily avoid the burden of checking if the lexer was > initialized prior to calling destroy by the caller, let's do it. > > This allows simplification in state tracking in later patches of the > qmp-async RFC series. Please include the patch in that series, where I can see its utility. > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > qobject/json-lexer.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c > index 980ba159d6..0eaba43a2c 100644 > --- a/qobject/json-lexer.c > +++ b/qobject/json-lexer.c > @@ -386,5 +386,8 @@ int json_lexer_flush(JSONLexer *lexer) > > void json_lexer_destroy(JSONLexer *lexer) > { > - g_string_free(lexer->token, true); > + if (lexer->token) { > + g_string_free(lexer->token, true); > + lexer->token = NULL; > + } > }
diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c index 980ba159d6..0eaba43a2c 100644 --- a/qobject/json-lexer.c +++ b/qobject/json-lexer.c @@ -386,5 +386,8 @@ int json_lexer_flush(JSONLexer *lexer) void json_lexer_destroy(JSONLexer *lexer) { - g_string_free(lexer->token, true); + if (lexer->token) { + g_string_free(lexer->token, true); + lexer->token = NULL; + } }
We can easily avoid the burden of checking if the lexer was initialized prior to calling destroy by the caller, let's do it. This allows simplification in state tracking in later patches of the qmp-async RFC series. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- qobject/json-lexer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)