guile/guile-core/guile-readline ChangeLog readl...

[Dirk Herrmann]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Dirk Herrmann <address@hidden>  00/11/24 02:24:04

Modified files:
        guile-core/guile-readline: ChangeLog readline.c 

Log message:
        * Don't uses anything deprecated any more.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/guile-readline/ChangeLog.diff?r1=1.43&r2=1.44
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/guile-readline/readline.c.diff?r1=1.27&r2=1.28

Patches:
Index: guile/guile-core/guile-readline/ChangeLog
diff -u guile/guile-core/guile-readline/ChangeLog:1.43 
guile/guile-core/guile-readline/ChangeLog:1.44
--- guile/guile-core/guile-readline/ChangeLog:1.43      Sun Nov 19 04:21:36 2000
+++ guile/guile-core/guile-readline/ChangeLog   Fri Nov 24 02:24:04 2000
@@ -1,3 +1,13 @@
+2000-11-24  Dirk Herrmann  <address@hidden>
+
+       * 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  <address@hidden>
 
        * configure.in: test $ac_cv_lib_readline_readline instead of
Index: guile/guile-core/guile-readline/readline.c
diff -u guile/guile-core/guile-readline/readline.c:1.27 
guile/guile-core/guile-readline/readline.c:1.28
--- guile/guile-core/guile-readline/readline.c:1.27     Sun Jun 18 17:48:35 2000
+++ guile/guile-core/guile-readline/readline.c  Fri Nov 24 02:24:04 2000
@@ -172,7 +172,7 @@
          --in_readline;
          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))
@@ -256,7 +256,7 @@
 {
   SCM ret;
   char *s;
-  char *prompt = SCM_UNBNDP (text) ? "" : SCM_CHARS (text);
+  char *prompt = SCM_UNBNDP (text) ? "" : SCM_STRING_CHARS (text);
 
   promptp = 1;
   s = readline (prompt);
@@ -328,9 +328,9 @@
 {
   char* s;
   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));
 
   return SCM_UNSPECIFIED;
@@ -344,7 +344,7 @@
 #define FUNC_NAME s_scm_read_history
 {
   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
 
@@ -355,7 +355,7 @@
 #define FUNC_NAME s_scm_write_history
 {
   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
 
@@ -368,8 +368,8 @@
   char *s;
   SCM ans;
   SCM_VALIDATE_STRING (1,text);
-  SCM_COERCE_SUBSTR (text);
-  s = filename_completion_function (SCM_CHARS (text), SCM_NFALSEP (continuep));
+  SCM_STRING_COERCE_0TERMINATION_X (text);
+  s = filename_completion_function (SCM_STRING_CHARS (text), SCM_NFALSEP 
(continuep));
   ans = scm_makfrom0str (s);
   free (s);
   return ans;
@@ -404,8 +404,8 @@
        scm_misc_error (s_scm_readline,
                        "Completion function returned bogus value: %S",
                        SCM_LIST1 (res));
-      SCM_COERCE_SUBSTR (res);
-      return strdup (SCM_CHARS (res));
+      SCM_STRING_COERCE_0TERMINATION_X (res);
+      return strdup (SCM_STRING_CHARS (res));
     }
 }