dmbcs/guile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Don't uses anything deprecated any more.

Browse source
This commit is contained in:
Dirk Herrmann 2000-11-24 10:24:04 +00:00
commit 08b5e6c316
2 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
guile-readline/ChangeLog
View file

@ -1,3 +1,13 @@
2000-11-24 Dirk Herrmann <D.Herrmann@tu-bs.de>
* readline.c (scm_readline, scm_add_history, completion_function,
scm_filename_completion_function): Replace calls to
SCM_COERCE_SUBSTR with SCM_STRING_COERCE_0TERMINATION_X.
(internal_readline, scm_add_history, scm_read_history,
scm_write_history, scm_filename_completion_function,
completion_function): Replace SCM_CHARS with SCM_STRING_CHARS.
2000-11-19 Gary Houston <ghouston@arglist.com> 2000-11-19 Gary Houston <ghouston@arglist.com>
* configure.in: test $ac_cv_lib_readline_readline instead of * configure.in: test $ac_cv_lib_readline_readline instead of

20
guile-readline/readline.c
View file

@ -172,7 +172,7 @@ SCM_DEFINE (scm_readline, "%readline", 0, 4, 0,
--in_readline; --in_readline;
scm_wrong_type_arg (s_scm_readline, SCM_ARG1, text); scm_wrong_type_arg (s_scm_readline, SCM_ARG1, text);
} }
SCM_COERCE_SUBSTR (text); SCM_STRING_COERCE_0TERMINATION_X (text);
} }
if (!((SCM_UNBNDP (inp) && SCM_NIMP (scm_cur_inp) && SCM_OPINFPORTP (inp)) if (!((SCM_UNBNDP (inp) && SCM_NIMP (scm_cur_inp) && SCM_OPINFPORTP (inp))
@ -256,7 +256,7 @@ internal_readline (SCM text)
{ {
SCM ret; SCM ret;
char *s; char *s;
char *prompt = SCM_UNBNDP (text) ? "" : SCM_CHARS (text); char *prompt = SCM_UNBNDP (text) ? "" : SCM_STRING_CHARS (text);
promptp = 1; promptp = 1;
s = readline (prompt); s = readline (prompt);
@ -328,9 +328,9 @@ SCM_DEFINE (scm_add_history, "add-history", 1, 0, 0,
{ {
char* s; char* s;
SCM_VALIDATE_STRING (1,text); SCM_VALIDATE_STRING (1,text);
SCM_COERCE_SUBSTR (text); SCM_STRING_COERCE_0TERMINATION_X (text);
s = SCM_CHARS (text); s = SCM_STRING_CHARS (text);
add_history (strdup (s)); add_history (strdup (s));
return SCM_UNSPECIFIED; return SCM_UNSPECIFIED;
@ -344,7 +344,7 @@ SCM_DEFINE (scm_read_history, "read-history", 1, 0, 0,
#define FUNC_NAME s_scm_read_history #define FUNC_NAME s_scm_read_history
{ {
SCM_VALIDATE_STRING (1,file); SCM_VALIDATE_STRING (1,file);
return SCM_NEGATE_BOOL(read_history (SCM_ROCHARS (file))); return SCM_NEGATE_BOOL (read_history (SCM_STRING_CHARS (file)));
} }
#undef FUNC_NAME #undef FUNC_NAME
@ -355,7 +355,7 @@ SCM_DEFINE (scm_write_history, "write-history", 1, 0, 0,
#define FUNC_NAME s_scm_write_history #define FUNC_NAME s_scm_write_history
{ {
SCM_VALIDATE_STRING (1,file); SCM_VALIDATE_STRING (1,file);
return SCM_NEGATE_BOOL(write_history (SCM_ROCHARS (file))); return SCM_NEGATE_BOOL (write_history (SCM_STRING_CHARS (file)));
} }
#undef FUNC_NAME #undef FUNC_NAME
@ -368,8 +368,8 @@ SCM_DEFINE (scm_filename_completion_function, "filename-completion-function", 2,
char *s; char *s;
SCM ans; SCM ans;
SCM_VALIDATE_STRING (1,text); SCM_VALIDATE_STRING (1,text);
SCM_COERCE_SUBSTR (text); SCM_STRING_COERCE_0TERMINATION_X (text);
s = filename_completion_function (SCM_CHARS (text), SCM_NFALSEP (continuep)); s = filename_completion_function (SCM_STRING_CHARS (text), SCM_NFALSEP (continuep));
ans = scm_makfrom0str (s); ans = scm_makfrom0str (s);
free (s); free (s);
return ans; return ans;
@ -404,8 +404,8 @@ completion_function (char *text, int continuep)
scm_misc_error (s_scm_readline, scm_misc_error (s_scm_readline,
"Completion function returned bogus value: %S", "Completion function returned bogus value: %S",
SCM_LIST1 (res)); SCM_LIST1 (res));
SCM_COERCE_SUBSTR (res); SCM_STRING_COERCE_0TERMINATION_X (res);
return strdup (SCM_CHARS (res)); return strdup (SCM_STRING_CHARS (res));
} }
} }