OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make exception throwers have void result. Delete unused gdbscm_scm_to_target_string_unsafe.

Browse Source 
* 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.
This commit is contained in:
Doug Evans 2014-05-21 11:52:51 -07:00
parent 6a3cb8e88a
commit 4a2722c51f
4 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -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

14
gdb/guile/guile-internal.h
View File

@ -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);

6
gdb/guile/scm-exception.c
View File

@ -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);

13
gdb/guile/scm-string.c
View File

@ -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. */