From 0af7fbe98ec09ec29caa7006762ac77e353a6c48 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Fri, 17 Jul 2020 00:34:23 -0400
Subject: [PATCH] use const char * instead of char * so we don't need a cast
 for string constants

---
 src/PYTHON/python_impl.cpp |  5 +++--
 src/PYTHON/python_impl.h   |  4 ++--
 src/lmppython.cpp          |  4 ++--
 src/lmppython.h            | 10 +++++-----
 src/variable.cpp           |  6 +++---
 src/variable.h             |  4 ++--
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/PYTHON/python_impl.cpp b/src/PYTHON/python_impl.cpp
index e027079f1f..c5b3de637a 100644
--- a/src/PYTHON/python_impl.cpp
+++ b/src/PYTHON/python_impl.cpp
@@ -359,7 +359,7 @@ void PythonImpl::invoke_function(int ifunc, char *result)
 
 /* ------------------------------------------------------------------ */
 
-int PythonImpl::find(char *name)
+int PythonImpl::find(const char *name)
 {
   for (int i = 0; i < nfunc; i++)
     if (strcmp(name,pfuncs[i].name) == 0) return i;
@@ -368,7 +368,8 @@ int PythonImpl::find(char *name)
 
 /* ------------------------------------------------------------------ */
 
-int PythonImpl::variable_match(char *name, char *varname, int numeric)
+int PythonImpl::variable_match(const char *name, const char *varname,
+                               int numeric)
 {
   int ifunc = find(name);
   if (ifunc < 0) return -1;
diff --git a/src/PYTHON/python_impl.h b/src/PYTHON/python_impl.h
index 2fd52b8ead..f53694a00b 100644
--- a/src/PYTHON/python_impl.h
+++ b/src/PYTHON/python_impl.h
@@ -27,8 +27,8 @@ class PythonImpl : protected Pointers, public PythonInterface {
   ~PythonImpl();
   void command(int, char **);
   void invoke_function(int, char *);
-  int find(char *);
-  int variable_match(char *, char *, int);
+  int find(const char *);
+  int variable_match(const char *, const char *, int);
   char *long_string(int);
   int execute_string(char *);
   int execute_file(char *);
diff --git a/src/lmppython.cpp b/src/lmppython.cpp
index 132790bdbe..67bbca15b6 100644
--- a/src/lmppython.cpp
+++ b/src/lmppython.cpp
@@ -80,7 +80,7 @@ void Python::invoke_function(int ifunc, char *result)
 
 /* ------------------------------------------------------------------ */
 
-int Python::find(char *name)
+int Python::find(const char *name)
 {
   init();
   return impl->find(name);
@@ -88,7 +88,7 @@ int Python::find(char *name)
 
 /* ------------------------------------------------------------------ */
 
-int Python::variable_match(char *name, char *varname, int numeric)
+int Python::variable_match(const char *name, const char *varname, int numeric)
 {
   init();
   return impl->variable_match(name, varname, numeric);
diff --git a/src/lmppython.h b/src/lmppython.h
index fab307d9e6..5254acb4e3 100644
--- a/src/lmppython.h
+++ b/src/lmppython.h
@@ -23,9 +23,9 @@ public:
   virtual ~PythonInterface();
   virtual void command(int, char **) = 0;
   virtual void invoke_function(int, char *) = 0;
-  virtual int find(char *) = 0;
-  virtual int variable_match(char *, char *, int) = 0;
-  virtual char * long_string(int ifunc) = 0;
+  virtual int find(const char *) = 0;
+  virtual int variable_match(const char *, const char *, int) = 0;
+  virtual char *long_string(int ifunc) = 0;
   virtual int execute_string(char *) = 0;
   virtual int execute_file(char *) = 0;
   virtual bool has_minimum_version(int major, int minor) = 0;
@@ -38,8 +38,8 @@ public:
 
   void command(int, char **);
   void invoke_function(int, char *);
-  int find(char *);
-  int variable_match(char *, char *, int);
+  int find(const char *);
+  int variable_match(const char *, const char *, int);
   char * long_string(int ifunc);
   int execute_string(char *);
   int execute_file(char *);
diff --git a/src/variable.cpp b/src/variable.cpp
index e3733314af..01653ef670 100644
--- a/src/variable.cpp
+++ b/src/variable.cpp
@@ -752,9 +752,9 @@ int Variable::next(int narg, char **arg)
    return index or -1 if not found
 ------------------------------------------------------------------------- */
 
-int Variable::find(char *name)
+int Variable::find(const char *name)
 {
-  if(name==NULL) return -1;
+  if (name == nullptr) return -1;
   for (int i = 0; i < nvar; i++)
     if (strcmp(name,names[i]) == 0) return i;
   return -1;
@@ -864,7 +864,7 @@ int Variable::internalstyle(int ivar)
      caller must respond
 ------------------------------------------------------------------------- */
 
-char *Variable::retrieve(char *name)
+char *Variable::retrieve(const char *name)
 {
   int ivar = find(name);
   if (ivar < 0) return NULL;
diff --git a/src/variable.h b/src/variable.h
index 2d0a1e23a3..fbeff40ac1 100644
--- a/src/variable.h
+++ b/src/variable.h
@@ -29,7 +29,7 @@ class Variable : protected Pointers {
   int set_string(char *, char *);
   int next(int, char **);
 
-  int find(char *);
+  int find(const char *);
   void set_arrays(int);
   void python_command(int, char **);
 
@@ -39,7 +39,7 @@ class Variable : protected Pointers {
   char *pythonstyle(char *, char *);
   int internalstyle(int);
 
-  char *retrieve(char *);
+  char *retrieve(const char *);
   double compute_equal(int);
   double compute_equal(char *);
   void compute_atom(int, int, double *, int, int);