/* GDB/Scheme charset interface.
- Copyright (C) 2014-2015 Free Software Foundation, Inc.
+ Copyright (C) 2014-2018 Free Software Foundation, Inc.
This file is part of GDB.
static SCM
gdbscm_call_scm_to_stringn (void *datap)
{
- struct scm_to_stringn_data *data = datap;
+ struct scm_to_stringn_data *data = (struct scm_to_stringn_data *) datap;
data->result = scm_to_stringn (data->string, data->lenp, data->charset,
data->conversion_kind);
static SCM
gdbscm_call_scm_from_stringn (void *datap)
{
- struct scm_from_stringn_data *data = datap;
+ struct scm_from_stringn_data *data = (struct scm_from_stringn_data *) datap;
data->result = scm_from_stringn (data->string, data->len, data->charset,
data->conversion_kind);
gdbscm_string_to_argv (SCM string_scm)
{
char *string;
- char **c_argv;
- int i;
SCM result = SCM_EOL;
gdbscm_parse_function_args (FUNC_NAME, SCM_ARG1, NULL, "s",
return SCM_EOL;
}
- c_argv = gdb_buildargv (string);
- for (i = 0; c_argv[i] != NULL; ++i)
- result = scm_cons (gdbscm_scm_from_c_string (c_argv[i]), result);
+ gdb_argv c_argv (string);
+ for (char *arg : c_argv)
+ result = scm_cons (gdbscm_scm_from_c_string (arg), result);
- freeargv (c_argv);
xfree (string);
return scm_reverse_x (result, SCM_EOL);
static const scheme_function string_functions[] =
{
- { "string->argv", 1, 0, 0, gdbscm_string_to_argv,
+ { "string->argv", 1, 0, 0, as_a_scm_t_subr (gdbscm_string_to_argv),
"\
Convert a string to a list of strings split up according to\n\
gdb's argv parsing rules." },