summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-07-03 19:08:50 +0200
committerGitHub <noreply@github.com>2024-07-03 19:08:50 +0200
commit929667cdc6c8c78ac0719e84237f68698a9d8f82 (patch)
treea7b55af5f2b7598428590e1e2a9766905bb101cd
parentb8bdc8a668ee7786fc6c19f91d18b944a5e9cdbc (diff)
parentd509db1020f1f18023871f4ff6149352cd69c800 (diff)
downloadvyatta-cfg-929667cdc6c8c78ac0719e84237f68698a9d8f82.tar.gz
vyatta-cfg-929667cdc6c8c78ac0719e84237f68698a9d8f82.zip
Merge pull request #85 from jestabro/remove-perl
T6527: remove remaining references to Perl
-rw-r--r--Makefile.am1
-rw-r--r--src/cstore/cstore.cpp15
2 files changed, 3 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index 073ee3a..2170f95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,6 @@ src_libvyatta_cfg_la_LIBADD += -lgobject-2.0
src_libvyatta_cfg_la_LIBADD += -lboost_system
src_libvyatta_cfg_la_LIBADD += -lboost_filesystem
src_libvyatta_cfg_la_LIBADD += -lapt-pkg
-src_libvyatta_cfg_la_LIBADD += -lperl
src_libvyatta_cfg_la_LDFLAGS = -version-info 1:0:0
src_libvyatta_cfg_la_SOURCES = src/cli_parse.y src/cli_def.l src/cli_val.l
src_libvyatta_cfg_la_SOURCES += src/cli_new.c src/cli_path_utils.c
diff --git a/src/cstore/cstore.cpp b/src/cstore/cstore.cpp
index c7870a2..bc6aa4d 100644
--- a/src/cstore/cstore.cpp
+++ b/src/cstore/cstore.cpp
@@ -3155,18 +3155,9 @@ Cstore::vexit_internal(const char *fmt, va_list alist)
vsnprintf(buf, 256, fmt, alist);
output_internal("%s\n", buf);
fprintf(stderr, "DEBUG vexit_internal: %s\n", buf); // DEBUG
- if (Perl_get_context()) {
- /* we're in a perl context. do a croak to provide more information.
- * note that the message should not end in "\n", or the croak message
- * will be truncated for some reason.
- */
- Perl_croak_nocontext("%s", buf);
- // does not return
- } else {
- // output error message and exit
- output_user_err("%s\n", buf);
- exit(1);
- }
+ // output error message and exit
+ output_user_err("%s\n", buf);
+ exit(1);
}
} // end namespace cstore