fixed g++ warnings

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9561 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2015-04-28 06:44:08 +00:00
parent 8e9134e325
commit 413fa2a7d4
2 changed files with 5 additions and 6 deletions

View File

@ -932,7 +932,7 @@ public:
struct unknown *unknown_alloc(void);
int unknown_delete(int i);
int unknown_free(struct unknown *unknown_ptr);
int entity_exists(char *name, int n_user);
int entity_exists(const char *name, int n_user);
static int inverse_compare(const void *ptr1, const void *ptr2);
int inverse_free(struct inverse *inverse_ptr);
static int kinetics_compare_int(const void *ptr1, const void *ptr2);

View File

@ -3449,7 +3449,7 @@ logk_search(const char *name_in)
/* ---------------------------------------------------------------------- */
int Phreeqc::
entity_exists(char *name, int n_user)
entity_exists(const char *name, int n_user)
/* ---------------------------------------------------------------------- */
{
/*
@ -3465,15 +3465,14 @@ entity_exists(char *name, int n_user)
* reaction_temperature 9 Temperature
* unknown 10 UnKnown
*/
int i, return_value;
char *ptr;
int return_value;
char token[MAX_LENGTH];
enum entity_type type;
/*
* Read keyword
*/
ptr = name;
copy_token(token, &ptr, &i);
strncpy(token, name, MAX_LENGTH-1);
token[MAX_LENGTH-1] = '\0';
type = get_entity_enum(token);
return_value = TRUE;
switch (type)