From 5009f76b004d09d876f80442576e812d9395af62 Mon Sep 17 00:00:00 2001 From: junkyu han Date: Tue, 5 Jun 2018 15:01:44 +0900 Subject: Change flora --> apache Change-Id: I5947293f54e5b661cfff42f577cd340d0773d79b --- src/webutil.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/webutil.c') diff --git a/src/webutil.c b/src/webutil.c index 7afde87..5938587 100644 --- a/src/webutil.c +++ b/src/webutil.c @@ -7,11 +7,11 @@ * Junkyu Han * Jeonghoon Park * - * Licensed under the Flora License, Version 1.1 (the License); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://floralicense.org/license/ + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an AS IS BASIS, @@ -679,17 +679,18 @@ char *web_util_get_json_string(void) retv_if(root == NULL, NULL); gen = json_generator_new(); - goto_if(gen == NULL, error_release_all); + goto_if(gen == NULL, DONE); json_generator_set_root(gen, root); str = json_generator_to_data(gen, NULL); - return str; +DONE: + if (gen) + g_object_unref(gen); -error_release_all: if (root) json_node_free(root); - return NULL; + return str; } -- cgit v1.2.3