---
libgeda/include/prototype.h | 2 +-
libgeda/src/g_rc.c | 22 +++++++++++-----------
libgeda/src/s_basic.c | 6 +++---
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index bbd3c68..ee78204 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -349,7 +349,7 @@ char *remove_nl(char *string);
char *remove_last_nl(char *string);
char *remove_string(char *string, int start, int end);
char *insert_string(char *string, int start, char *insert_string);
-char *expand_env_variables(char *string);
+char *s_expand_env_variables(char *string);
/* s_clib.c */
void s_clib_free (void);
diff --git a/libgeda/src/g_rc.c b/libgeda/src/g_rc.c
index 2e4338e..6e91098 100644
--- a/libgeda/src/g_rc.c
+++ b/libgeda/src/g_rc.c
@@ -415,7 +415,7 @@ SCM g_rc_component_library(SCM path, SCM name)
string = g_strdup (SCM_STRING_CHARS (path));
/* take care of any shell variables */
- string = expand_env_variables(string);
+ string = s_expand_env_variables(string);
/* invalid path? */
if (!g_file_test (string, G_FILE_TEST_IS_DIR)) {
@@ -486,8 +486,8 @@ SCM g_rc_component_library_command (SCM listcmd, SCM getcmd,
/* take care of any shell variables */
/*! \bug this may be a security risk! */
- lcmdstr = expand_env_variables(lcmdstr);
- gcmdstr = expand_env_variables(gcmdstr);
+ lcmdstr = s_expand_env_variables(lcmdstr);
+ gcmdstr = s_expand_env_variables(gcmdstr);
src = s_clib_add_command (lcmdstr, gcmdstr, namestr);
@@ -550,7 +550,7 @@ SCM g_rc_component_library_search(SCM path)
string = g_strdup (SCM_STRING_CHARS (path));
/* take care of any shell variables */
- string = expand_env_variables(string);
+ string = s_expand_env_variables(string);
/* invalid path? */
if (!g_file_test (string, G_FILE_TEST_IS_DIR)) {
@@ -626,7 +626,7 @@ SCM g_rc_source_library(SCM path)
string = g_strdup (SCM_STRING_CHARS (path));
/* take care of any shell variables */
- string = expand_env_variables(string);
+ string = s_expand_env_variables(string);
/* invalid path? */
if (!g_file_test (string, G_FILE_TEST_IS_DIR)) {
@@ -679,7 +679,7 @@ SCM g_rc_source_library_search(SCM path)
string = g_strdup (SCM_STRING_CHARS (path));
/* take care of any shell variables */
- string = expand_env_variables(string);
+ string = s_expand_env_variables(string);
/* invalid path? */
if (!g_file_test (string, G_FILE_TEST_IS_DIR)) {
@@ -843,7 +843,7 @@ SCM g_rc_font_directory(SCM path)
string = g_strdup (SCM_STRING_CHARS (path));
/* take care of any shell variables */
- string = expand_env_variables(string);
+ string = s_expand_env_variables(string);
/* invalid path? */
if (!g_file_test (string, G_FILE_TEST_IS_DIR)) {
@@ -880,7 +880,7 @@ SCM g_rc_scheme_directory(SCM path)
string = g_strdup (SCM_STRING_CHARS (path));
/* take care of any shell variables */
- string = expand_env_variables(string);
+ string = s_expand_env_variables(string);
/* invalid path? */
if (!g_file_test (string, G_FILE_TEST_IS_DIR)) {
@@ -917,7 +917,7 @@ SCM g_rc_bitmap_directory(SCM path)
string = g_strdup (SCM_STRING_CHARS (path));
/* take care of any shell variables */
- string = expand_env_variables(string);
+ string = s_expand_env_variables(string);
/* invalid path? */
if (!g_file_test (string, G_FILE_TEST_IS_DIR)) {
@@ -978,7 +978,7 @@ SCM g_rc_postscript_prolog(SCM scmsymname)
string = g_strdup (SCM_STRING_CHARS (scmsymname));
/* take care of any shell variables */
- string = expand_env_variables(string);
+ string = s_expand_env_variables(string);
default_postscript_prolog = g_strdup (string);
@@ -1042,7 +1042,7 @@ SCM g_rc_map_font_character_to_file(SCM scmcharstr, SCM
scmfilename)
}
/* take care of expansion of any shell variables in filename */
- filename = expand_env_variables (g_strdup (filename));
+ filename = s_expand_env_variables (g_strdup (filename));
character = g_utf8_get_char_validated (charstr, -1);
diff --git a/libgeda/src/s_basic.c b/libgeda/src/s_basic.c
index 837561b..3e4fdf7 100644
--- a/libgeda/src/s_basic.c
+++ b/libgeda/src/s_basic.c
@@ -685,7 +685,7 @@ void vsnprintf(char *buff, size_t bufsiz, const char *fmt,
va_list ap)
* \par Function Description
*
*/
-/* this function is called by expand_env_variables */
+/* this function is called by s_expand_env_variables */
/* changes and returns new string, frees the one that was passed in */
char *remove_string(char *string, int start, int end)
{
@@ -725,7 +725,7 @@ char *remove_string(char *string, int start, int end)
* \par Function Description
*
*/
-/* this function is called by expand_env_variables */
+/* this function is called by s_expand_env_variables */
/* changes and returns new string, frees the one that was passed in */
char *insert_string(char *string, int start, char *insert_string)
{
@@ -784,7 +784,7 @@ char *insert_string(char *string, int start, char
*insert_string)
* expanded environment variables, frees passed in string */
/* Environment variables MUST be in the form ${variable_name} */
/* $variable_name is not valid here */
-char *expand_env_variables(char *string)
+char *s_expand_env_variables(char *string)
{
char wanted_var[80]; /* size is hack */
char *return_string=NULL;
--
1.5.6
_______________________________________________
geda-dev mailing list
[email protected]
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
