Make exception throwers have void result. Delete unused gdbscm_scm_to_target_string_...

	* scm-exception.c (gdbscm_invalid_object_error): Make result is void.
	(gdbscm_out_of_range_error): Ditto.
	(gdbscm_memory_error): Ditto.
	* scm-string.c (gdbscm_scm_to_target_string_unsafe): Delete.
	* guile-internal.h (gdbscm_invalid_object_error): Update.
	(gdbscm_out_of_range_error): Update.
	(gdbscm_memory_error): Update.
	(gdbscm_scm_to_target_string_unsafe): Delete.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ba052db0c90fbf0aeb398cfd0aeea70f79e0fa53..6658da6842aa0d0e7f6a033f0adbcd33a3714b41 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2014-05-21  Doug Evans  <xdje42@gmail.com>
+
+       * scm-exception.c (gdbscm_invalid_object_error): Make result is void.
+       (gdbscm_out_of_range_error): Ditto.
+       (gdbscm_memory_error): Ditto.
+       * scm-string.c (gdbscm_scm_to_target_string_unsafe): Delete.
+       * guile-internal.h (gdbscm_invalid_object_error): Update.
+       (gdbscm_out_of_range_error): Update.
+       (gdbscm_memory_error): Update.
+       (gdbscm_scm_to_target_string_unsafe): Delete.
+
 2014-05-21  Pedro Alves  <palves@redhat.com>
 
        * inf-child.c (inf_child_ops, inf_child_explicitly_opened): New

diff --git a/gdb/guile/guile-internal.h b/gdb/guile/guile-internal.h
index f95f0920283b58d2c8eb407805f8841a93f13c81..b6d01f453bc1192c8d0afa474fad265d50c8003d 100644 (file)
--- a/gdb/guile/guile-internal.h
+++ b/gdb/guile/guile-internal.h
@@ -274,15 +274,15 @@ extern SCM gdbscm_make_type_error (const char *subr, int arg_pos,
 extern SCM gdbscm_make_invalid_object_error (const char *subr, int arg_pos,
                                             SCM bad_value, const char *error);
 
-extern SCM gdbscm_invalid_object_error (const char *subr, int arg_pos,
-                                       SCM bad_value, const char *error)
+extern void gdbscm_invalid_object_error (const char *subr, int arg_pos,
+                                        SCM bad_value, const char *error)
    ATTRIBUTE_NORETURN;
 
 extern SCM gdbscm_make_out_of_range_error (const char *subr, int arg_pos,
                                           SCM bad_value, const char *error);
 
-extern SCM gdbscm_out_of_range_error (const char *subr, int arg_pos,
-                                     SCM bad_value, const char *error)
+extern void gdbscm_out_of_range_error (const char *subr, int arg_pos,
+                                      SCM bad_value, const char *error)
    ATTRIBUTE_NORETURN;
 
 extern SCM gdbscm_make_misc_error (const char *subr, int arg_pos,
@@ -307,7 +307,8 @@ extern excp_matcher_func gdbscm_memory_error_p;
 extern SCM gdbscm_make_memory_error (const char *subr, const char *msg,
                                     SCM args);
 
-extern SCM gdbscm_memory_error (const char *subr, const char *msg, SCM args);
+extern void gdbscm_memory_error (const char *subr, const char *msg, SCM args)
+  ATTRIBUTE_NORETURN;
 
 /* scm-safe-call.c */
 
@@ -441,9 +442,6 @@ extern char *gdbscm_scm_to_string (SCM string, size_t *lenp,
 extern SCM gdbscm_scm_from_string (const char *string, size_t len,
                                   const char *charset, int strict);
 
-extern char *gdbscm_scm_to_target_string_unsafe (SCM string, size_t *lenp,
-                                                struct gdbarch *gdbarch);
-
 /* scm-symbol.c */
 
 extern int syscm_is_symbol (SCM scm);

diff --git a/gdb/guile/scm-exception.c b/gdb/guile/scm-exception.c
index a96a350f13c41fb5fcecc2172bee9d5068a40730..ffe83ede184b833b74f502413d74f712a54ccd67 100644 (file)
--- a/gdb/guile/scm-exception.c
+++ b/gdb/guile/scm-exception.c
@@ -332,7 +332,7 @@ gdbscm_make_invalid_object_error (const char *subr, int arg_pos, SCM bad_value,
 /* Throw an invalid-object error.
    OBJECT is the name of the kind of object that is invalid.  */
 
-SCM
+void
 gdbscm_invalid_object_error (const char *subr, int arg_pos, SCM bad_value,
                             const char *object)
 {
@@ -356,7 +356,7 @@ gdbscm_make_out_of_range_error (const char *subr, int arg_pos, SCM bad_value,
 /* Throw an out-of-range error.
    This is the standard Guile out-of-range exception.  */
 
-SCM
+void
 gdbscm_out_of_range_error (const char *subr, int arg_pos, SCM bad_value,
                           const char *error)
 {
@@ -387,7 +387,7 @@ gdbscm_make_memory_error (const char *subr, const char *msg, SCM args)
 
 /* Throw a gdb:memory-error exception.  */
 
-SCM
+void
 gdbscm_memory_error (const char *subr, const char *msg, SCM args)
 {
   SCM exception = gdbscm_make_memory_error (subr, msg, args);

diff --git a/gdb/guile/scm-string.c b/gdb/guile/scm-string.c
index 87ecabf5a72491edb1e5a97e31a1b90dca8ba374..c8d81c4a8bddfb6bd36d141eedaa929e4b1201f5 100644 (file)
--- a/gdb/guile/scm-string.c
+++ b/gdb/guile/scm-string.c
@@ -183,19 +183,6 @@ gdbscm_scm_from_string (const char *string, size_t len,
   return scm_result;
 }
 
-/* Convert an SCM string to a target string.
-   This function will thrown a conversion error if there's a problem.
-   Space for the result is allocated with malloc, caller must free.
-   It is an error to call this if STRING is not a string.  */
-
-char *
-gdbscm_scm_to_target_string_unsafe (SCM string, size_t *lenp,
-                                   struct gdbarch *gdbarch)
-{
-  return scm_to_stringn (string, lenp, target_charset (gdbarch),
-                        SCM_FAILED_CONVERSION_ERROR);
-}
-
 /* (string->argv string) -> list
    Return list of strings split up according to GDB's argv parsing rules.
    This is useful when writing GDB commands in Scheme.  */