lib: Rename frrscript_unload to delete

frrscript_load now loads a function instead of a file, so frrscript_unload
should be renamed since it does not unload a function.

Signed-off-by: Donald Lee <dlqs@gmx.com>

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 0b22caaee7c41b25b76d8fa874233cc23528fb0d..c2062a5f60690bacfaaf6994e96948bc7251a362 100644 (file)
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -434,7 +434,7 @@ route_match_script(void *rule, const struct prefix *prefix, void *object)
                break;
        }
 
-       frrscript_unload(fs);
+       frrscript_delete(fs);
 
        return status;
 }

diff --git a/lib/command.c b/lib/command.c
index 7808f57594ec3b858c54eee0263ddc9d63211a8b..ceea186a9dad079418fb7d31a8828b5960b0f448 100644 (file)
--- a/lib/command.c
+++ b/lib/command.c
@@ -2443,7 +2443,7 @@ DEFUN(script,
        vty_out(vty, "p: %s\n", buf);
        vty_out(vty, "Script result: %d\n", ret);
 
-       frrscript_unload(fs);
+       frrscript_delete(fs);
 
        return CMD_SUCCESS;
 }

diff --git a/lib/frrscript.c b/lib/frrscript.c
index 8252455fd9951e2fc0acffed319926329626fd2b..b3f8a9f6f50db455f0f6b7c37e7f8983b18b51ba 100644 (file)
--- a/lib/frrscript.c
+++ b/lib/frrscript.c
@@ -319,7 +319,7 @@ fail:
        return 1;
 }
 
-void frrscript_unload(struct frrscript *fs)
+void frrscript_delete(struct frrscript *fs)
 {
        hash_iterate(fs->lua_function_hash, lua_function_free, NULL);
        XFREE(MTYPE_SCRIPT, fs->name);

diff --git a/lib/frrscript.h b/lib/frrscript.h
index 1f234a38a9339c95ebefa2e39c5529937db7e272..14a922a74153f9454e254212f9bd7f3953e602ca 100644 (file)
--- a/lib/frrscript.h
+++ b/lib/frrscript.h
@@ -89,7 +89,7 @@ int frrscript_load(struct frrscript *fs, const char *function_name,
 /*
  * Destroy FRR script.
  */
-void frrscript_unload(struct frrscript *fs);
+void frrscript_delete(struct frrscript *fs);
 
 /*
  * Register a Lua codec for a type.

diff --git a/tests/lib/test_frrscript.c b/tests/lib/test_frrscript.c
index e01807f193a67416bdb94d8340efcc4b7cc8a541..2d5746b5872419472ba5b4845705665e47134d29 100644 (file)
--- a/tests/lib/test_frrscript.c
+++ b/tests/lib/test_frrscript.c
@@ -98,7 +98,7 @@ int main(int argc, char **argv)
        result = frrscript_call(fs, "bad_return4");
        assert(result == 1);
 
-       frrscript_unload(fs);
+       frrscript_delete(fs);
 
        return 0;
 }