Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / frrscript.c

diff --git a/lib/frrscript.c b/lib/frrscript.c
index 2e56932613261fe69e7245965f34ecf950978557..1b99c7e2c6df5efcb333367d2b6c601335733ea8 100644 (file)
--- a/lib/frrscript.c
+++ b/lib/frrscript.c
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* Scripting foo
  * Copyright (C) 2020  NVIDIA Corporation
  * Quentin Young
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <zebra.h>
 
@@ -411,8 +398,7 @@ fail:
 
 void frrscript_delete(struct frrscript *fs)
 {
-       hash_clean(fs->lua_function_hash, lua_function_free);
-       hash_free(fs->lua_function_hash);
+       hash_clean_and_free(&fs->lua_function_hash, lua_function_free);
        XFREE(MTYPE_SCRIPT, fs->name);
        XFREE(MTYPE_SCRIPT, fs);
 }
@@ -430,8 +416,7 @@ void frrscript_init(const char *sd)
 
 void frrscript_fini(void)
 {
-       hash_clean(codec_hash, codec_free);
-       hash_free(codec_hash);
+       hash_clean_and_free(&codec_hash, codec_free);
 
        frrscript_names_destroy();
 }