[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.0-20110116-131-g5f4308e)
The branch, master has been updated
via 5f4308e8a6421175751aac21763d694973b6a016 (commit)
via d908e616b814fa2b2836c953684fdb6e6cfa5361 (commit)
via 113ab5ee6cf557b17bf47c521147230e462e92af (commit)
via 2404ee24d3679ee55b7c0d28c54a456a13363fab (commit)
via 6eaf4f05e794741194c16151854f54df5cd73092 (commit)
via b7edaba5db2059cae36b9b83c67507ffb6e601b2 (commit)
via c005781278c095fffa6e31a68698204ae6e41f2c (commit)
via faffc3449660df53cd7f42a51687ed09f77fc9b6 (commit)
from d5d1a98f0e95589c33bff881198cca01a1b08c7e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gschem/src/g_funcs.c | 107 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 37 deletions(-)
=================
Commit Messages
=================
commit 5f4308e8a6421175751aac21763d694973b6a016
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_browse_wiki: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
:100644 100644 04ef08b... 74ee9f7... M gschem/src/g_funcs.c
commit d908e616b814fa2b2836c953684fdb6e6cfa5361
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_filesel: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
:100644 100644 2b800d1... 04ef08b... M gschem/src/g_funcs.c
commit 113ab5ee6cf557b17bf47c521147230e462e92af
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_confirm: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
:100644 100644 96e8463... 2b800d1... M gschem/src/g_funcs.c
commit 2404ee24d3679ee55b7c0d28c54a456a13363fab
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_msg: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
:100644 100644 b668e1a... 96e8463... M gschem/src/g_funcs.c
commit 6eaf4f05e794741194c16151854f54df5cd73092
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_log: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
:100644 100644 8176f88... b668e1a... M gschem/src/g_funcs.c
commit b7edaba5db2059cae36b9b83c67507ffb6e601b2
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_image: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
:100644 100644 7ea9e71... 8176f88... M gschem/src/g_funcs.c
commit c005781278c095fffa6e31a68698204ae6e41f2c
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_postscript: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
:100644 100644 c2c076c... 7ea9e71... M gschem/src/g_funcs.c
commit faffc3449660df53cd7f42a51687ed09f77fc9b6
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_print: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
:100644 100644 73bb9db... c2c076c... M gschem/src/g_funcs.c
=========
Changes
=========
commit 5f4308e8a6421175751aac21763d694973b6a016
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_browse_wiki: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
diff --git a/gschem/src/g_funcs.c b/gschem/src/g_funcs.c
index 04ef08b..74ee9f7 100644
--- a/gschem/src/g_funcs.c
+++ b/gschem/src/g_funcs.c
@@ -362,7 +362,7 @@ SCM g_funcs_browse_wiki(SCM wikiname)
/* Extract wiki name string from Scheme value structure.
* If not a string, use the empty string */
if (scm_is_string (wikiname)) {
- wikistr = SCM_STRING_CHARS(wikiname);
+ wikistr = scm_to_utf8_string(wikiname);
} else {
wikistr = "";
}
@@ -374,10 +374,14 @@ SCM g_funcs_browse_wiki(SCM wikiname)
if (pid < 0) {
/* Fork failed. Still in parent process, so can use the log
* window */
+ if (scm_is_string (wikiname))
+ free(wikistr);
s_log_message(_("Could not fork\n"));
return SCM_BOOL_F;
} else if (pid > 0) {
/* Parent process, we're finished here */
+ if (scm_is_string (wikiname))
+ free(wikistr);
return SCM_BOOL_T;
}
commit d908e616b814fa2b2836c953684fdb6e6cfa5361
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_filesel: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
diff --git a/gschem/src/g_funcs.c b/gschem/src/g_funcs.c
index 2b800d1..04ef08b 100644
--- a/gschem/src/g_funcs.c
+++ b/gschem/src/g_funcs.c
@@ -202,16 +202,16 @@ SCM g_funcs_confirm(SCM scm_msg)
* \par Function Description
*
*/
-SCM g_funcs_filesel(SCM msg, SCM templ, SCM flags)
+SCM g_funcs_filesel(SCM scm_msg, SCM scm_templ, SCM scm_flags)
{
int c_flags;
- char * r;
+ char *r, *msg, *templ;
SCM v;
- SCM_ASSERT (scm_is_string (msg), msg,
+ SCM_ASSERT (scm_is_string (scm_msg), scm_msg,
SCM_ARG1, "gschem-filesel");
- SCM_ASSERT (scm_is_string (templ), templ,
+ SCM_ASSERT (scm_is_string (scm_templ), scm_templ,
SCM_ARG1, "gschem-filesel");
/*! \bug FIXME -- figure out the magic SCM_ASSERT for the flags */
@@ -219,32 +219,40 @@ SCM g_funcs_filesel(SCM msg, SCM templ, SCM flags)
/*! \bug FIXME -- how to deal with conflicting flags?
* Should I throw a scheme error? Just deal in the c code?
*/
- for (c_flags = 0; scm_is_pair (flags); flags = SCM_CDR (flags)) {
- SCM f = SCM_CAR (flags);
- if (strcmp (SCM_STRING_CHARS (f), "may_exist") == 0) {
+ for (c_flags = 0; scm_is_pair (scm_flags); scm_flags = SCM_CDR (scm_flags)) {
+ char *flag;
+ SCM scm_flag = SCM_CAR (scm_flags);
+
+ flag = scm_to_utf8_string (scm_flag);
+ if (strcmp (flag, "may_exist") == 0) {
c_flags |= FSB_MAY_EXIST;
- } else if (strcmp (SCM_STRING_CHARS (f), "must_exist") == 0) {
+ } else if (strcmp (flag, "must_exist") == 0) {
c_flags |= FSB_MUST_EXIST;
- } else if (strcmp (SCM_STRING_CHARS (f), "must_not_exist") == 0) {
+ } else if (strcmp (flag, "must_not_exist") == 0) {
c_flags |= FSB_SHOULD_NOT_EXIST;
- } else if (strcmp (SCM_STRING_CHARS (f), "save") == 0) {
+ } else if (strcmp (flag, "save") == 0) {
c_flags |= FSB_SAVE;
- } else if (strcmp (SCM_STRING_CHARS (f), "open") == 0) {
+ } else if (strcmp (flag, "open") == 0) {
c_flags |= FSB_LOAD;
} else {
- scm_wrong_type_arg ("gschem-filesel", 1, f);
+ free(flag);
+ scm_wrong_type_arg ("gschem-filesel", SCM_ARG1, scm_flag);
}
+ free(flag);
}
- r = generic_filesel_dialog (SCM_STRING_CHARS (msg),
- SCM_STRING_CHARS (templ),
- c_flags
- );
+ msg = scm_to_utf8_string (scm_msg);
+ templ = scm_to_utf8_string (scm_templ);
+
+ r = generic_filesel_dialog (msg, templ, c_flags);
+
+ free(msg);
+ free(templ);
v = scm_from_utf8_string (r);
g_free (r);
commit 113ab5ee6cf557b17bf47c521147230e462e92af
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_confirm: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
diff --git a/gschem/src/g_funcs.c b/gschem/src/g_funcs.c
index 96e8463..2b800d1 100644
--- a/gschem/src/g_funcs.c
+++ b/gschem/src/g_funcs.c
@@ -179,14 +179,17 @@ SCM g_funcs_msg(SCM scm_msg)
* \par Function Description
*
*/
-SCM g_funcs_confirm(SCM msg)
+SCM g_funcs_confirm(SCM scm_msg)
{
int r;
+ char *msg;
- SCM_ASSERT (scm_is_string (msg), msg,
+ SCM_ASSERT (scm_is_string (scm_msg), scm_msg,
SCM_ARG1, "gschem-msg");
- r = generic_confirm_dialog (SCM_STRING_CHARS (msg));
+ msg = scm_to_utf8_string (scm_msg);
+ r = generic_confirm_dialog (msg);
+ free(msg);
if (r)
return SCM_BOOL_T;
commit 2404ee24d3679ee55b7c0d28c54a456a13363fab
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_msg: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
diff --git a/gschem/src/g_funcs.c b/gschem/src/g_funcs.c
index b668e1a..96e8463 100644
--- a/gschem/src/g_funcs.c
+++ b/gschem/src/g_funcs.c
@@ -160,13 +160,16 @@ SCM g_funcs_log(SCM scm_msg)
* \par Function Description
*
*/
-SCM g_funcs_msg(SCM msg)
+SCM g_funcs_msg(SCM scm_msg)
{
+ char *msg;
- SCM_ASSERT (scm_is_string (msg), msg,
+ SCM_ASSERT (scm_is_string (scm_msg), scm_msg,
SCM_ARG1, "gschem-msg");
- generic_msg_dialog (SCM_STRING_CHARS (msg));
+ msg = scm_to_utf8_string (scm_msg);
+ generic_msg_dialog (msg);
+ free(msg);
return SCM_BOOL_T;
}
commit 6eaf4f05e794741194c16151854f54df5cd73092
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_log: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
diff --git a/gschem/src/g_funcs.c b/gschem/src/g_funcs.c
index 8176f88..b668e1a 100644
--- a/gschem/src/g_funcs.c
+++ b/gschem/src/g_funcs.c
@@ -141,13 +141,16 @@ SCM g_funcs_exit(void)
* \par Function Description
*
*/
-SCM g_funcs_log(SCM msg)
+SCM g_funcs_log(SCM scm_msg)
{
+ char *msg;
- SCM_ASSERT (scm_is_string (msg), msg,
+ SCM_ASSERT (scm_is_string (scm_msg), scm_msg,
SCM_ARG1, "gschem-log");
- s_log_message ("%s", SCM_STRING_CHARS (msg));
+ msg = scm_to_utf8_string (scm_msg);
+ s_log_message ("%s", msg);
+ free(msg);
return SCM_BOOL_T;
}
commit b7edaba5db2059cae36b9b83c67507ffb6e601b2
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_image: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
diff --git a/gschem/src/g_funcs.c b/gschem/src/g_funcs.c
index 7ea9e71..8176f88 100644
--- a/gschem/src/g_funcs.c
+++ b/gschem/src/g_funcs.c
@@ -102,9 +102,11 @@ SCM g_funcs_postscript(SCM scm_filename)
* \par Function Description
*
*/
-SCM g_funcs_image(SCM filename)
+SCM g_funcs_image(SCM scm_filename)
{
- SCM_ASSERT (scm_is_string (filename), filename,
+ char *filename;
+
+ SCM_ASSERT (scm_is_string (scm_filename), scm_filename,
SCM_ARG1, "gschem-image");
if (output_filename) {
@@ -113,10 +115,12 @@ SCM g_funcs_image(SCM filename)
global_window_current->image_height,
g_strdup("png"));
} else {
- x_image_lowlevel (global_window_current, SCM_STRING_CHARS (filename),
+ filename = scm_to_utf8_string (scm_filename);
+ x_image_lowlevel (global_window_current, filename,
global_window_current->image_width,
global_window_current->image_height,
g_strdup("png"));
+ free(filename);
}
return SCM_BOOL_T;
commit c005781278c095fffa6e31a68698204ae6e41f2c
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_postscript: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
diff --git a/gschem/src/g_funcs.c b/gschem/src/g_funcs.c
index c2c076c..7ea9e71 100644
--- a/gschem/src/g_funcs.c
+++ b/gschem/src/g_funcs.c
@@ -73,11 +73,12 @@ SCM g_funcs_print(SCM scm_filename)
* \par Function Description
*
*/
-SCM g_funcs_postscript(SCM filename)
+SCM g_funcs_postscript(SCM scm_filename)
{
+ char *filename;
TOPLEVEL *toplevel = global_window_current->toplevel;
- SCM_ASSERT (scm_is_string (filename), filename,
+ SCM_ASSERT (scm_is_string (scm_filename), scm_filename,
SCM_ARG1, "gschem-postscript");
if (output_filename) {
@@ -85,9 +86,12 @@ SCM g_funcs_postscript(SCM filename)
output_filename))
return SCM_BOOL_F;
} else {
- if (f_print_file (toplevel, toplevel->page_current,
- SCM_STRING_CHARS (filename)))
+ filename = scm_to_utf8_string(scm_filename);
+ if (f_print_file (toplevel, toplevel->page_current, filename)) {
+ free(filename);
return SCM_BOOL_F;
+ }
+ free(filename);
}
return SCM_BOOL_T;
commit faffc3449660df53cd7f42a51687ed09f77fc9b6
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: g_funcs_print: remove use of deprecated SCM_STRING_CHARS
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
diff --git a/gschem/src/g_funcs.c b/gschem/src/g_funcs.c
index 73bb9db..c2c076c 100644
--- a/gschem/src/g_funcs.c
+++ b/gschem/src/g_funcs.c
@@ -44,11 +44,12 @@
* \par Function Description
*
*/
-SCM g_funcs_print(SCM filename)
+SCM g_funcs_print(SCM scm_filename)
{
+ char *filename;
TOPLEVEL *toplevel = global_window_current->toplevel;
- SCM_ASSERT (scm_is_string (filename), filename,
+ SCM_ASSERT (scm_is_string (scm_filename), scm_filename,
SCM_ARG1, "gschem-print");
if (output_filename) {
@@ -56,9 +57,12 @@ SCM g_funcs_print(SCM filename)
output_filename))
return SCM_BOOL_F;
} else {
- if (f_print_file (toplevel, toplevel->page_current,
- SCM_STRING_CHARS (filename)))
+ filename = scm_to_utf8_string(scm_filename);
+ if (f_print_file (toplevel, toplevel->page_current, filename)) {
+ free(filename);
return SCM_BOOL_F;
+ }
+ free(filename);
}
return SCM_BOOL_T;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs