X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Ffd-cache%2Ffd-cache.c;h=944508392752cc37c1e82efb75adfa67dc00e519;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hp=9a742a4515028a554969ba7aec04d9b0ae2cdb10;hpb=86d8b7b82095055ced36135ecf4336753360cea4;p=babeltrace.git diff --git a/src/fd-cache/fd-cache.c b/src/fd-cache/fd-cache.c index 9a742a45..94450839 100644 --- a/src/fd-cache/fd-cache.c +++ b/src/fd-cache/fd-cache.c @@ -1,29 +1,9 @@ /* - * fd-cache.c - * - * Babeltrace - File descriptor cache + * SPDX-License-Identifier: MIT * * Copyright 2019 Francis Deslauriers * - * Author: Francis Deslauriers - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * Babeltrace - File descriptor cache */ #define BT_LOG_OUTPUT_LEVEL (fdc->log_level) @@ -120,13 +100,17 @@ int bt_fd_cache_init(struct bt_fd_cache *fdc, int log_level) BT_HIDDEN void bt_fd_cache_fini(struct bt_fd_cache *fdc) { - BT_ASSERT(fdc->cache); + if (!fdc->cache) { + goto end; + } + /* * All handle should have been removed for the hashtable at this point. */ BT_ASSERT(g_hash_table_size(fdc->cache) == 0); g_hash_table_destroy(fdc->cache); +end: return; }