diff options
author | junkyu han <junkyu.han@samsung.com> | 2018-06-05 15:01:44 +0900 |
---|---|---|
committer | junkyu han <junkyu.han@samsung.com> | 2018-06-05 15:02:04 +0900 |
commit | 5009f76b004d09d876f80442576e812d9395af62 (patch) | |
tree | f1deff9dac8ba6fa5c3774ccc380ca4f8224fc1e /src/webutil.c | |
parent | c70bb383f83da22710cc7f3d37970035b748ff14 (diff) | |
download | rcc-5009f76b004d09d876f80442576e812d9395af62.tar.gz rcc-5009f76b004d09d876f80442576e812d9395af62.tar.bz2 rcc-5009f76b004d09d876f80442576e812d9395af62.zip |
Change flora --> apache
Change-Id: I5947293f54e5b661cfff42f577cd340d0773d79b
Diffstat (limited to 'src/webutil.c')
-rw-r--r-- | src/webutil.c | 13 |
1 files changed, 7 insertions, 6 deletions
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 <junkyu.han@samsung.com> * Jeonghoon Park <jh1979.park@samsung.com> * - * 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; } |