[Pkg-electronics-commits] [gnucap] 17/43: char* for GNUCAP_PLUGPATH storage

felix salfelder felix-guest at moszumanska.debian.org
Wed Oct 4 03:21:44 UTC 2017


This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository gnucap.

commit 6197b346e3e82ce95b9eb6f8cf568e22507c3c0e
Author: Felix Salfelder <felix at salfelder.org>
Date:   Tue Apr 11 12:04:45 2017 +0200

    char* for GNUCAP_PLUGPATH storage
    
    should be equivalent, but less scary
---
 include/patchlev.h | 2 +-
 main/main.cc       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/patchlev.h b/include/patchlev.h
index 65973b3..ff0c271 100644
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@ -1 +1 @@
-#define PATCHLEVEL "plugpath-3c 2017.03.24"
+#define PATCHLEVEL "plugpath-3c 2017.04.11"
diff --git a/main/main.cc b/main/main.cc
index e4bbf05..790ba99 100644
--- a/main/main.cc
+++ b/main/main.cc
@@ -62,11 +62,11 @@ static void sign_on(void)
 /*--------------------------------------------------------------------------*/
 static void prepare_env()
 {
-  static std::string plugpath("PLUGPATH=" GNUCAP_PLUGPATH
-                              "\0         (reserved space)                 ");
+  static const char* plugpath="PLUGPATH=" GNUCAP_PLUGPATH
+                              "\0         (reserved space)                 ";
 
   std::string ldlpath = OS::getenv("LD_LIBRARY_PATH");
-  OS::setenv("GNUCAP_PLUGPATH", ldlpath + ':' + plugpath.substr(9), false);
+  OS::setenv("GNUCAP_PLUGPATH", ldlpath + ':' + (plugpath+9), false);
 }
 /*--------------------------------------------------------------------------*/
 static void read_startup_files(void)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git



More information about the Pkg-electronics-commits mailing list