summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c
diff options
context:
space:
mode:
authorLothar Scholz <[email protected]>2017-12-23 01:10:43 +0100
committerLothar Scholz <[email protected]>2017-12-23 01:10:43 +0100
commit06f90a3b45fa4f241bbc43e91287aa9a127dc8c3 (patch)
tree46ab4c39e6784ac4bb6efbe4af28bfd6653d5f8c /mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c
parent100f0e6759be8e439e586acf01032d2b8b96c6bd (diff)
downloadmruby-06f90a3b45fa4f241bbc43e91287aa9a127dc8c3.tar.gz
mruby-06f90a3b45fa4f241bbc43e91287aa9a127dc8c3.zip
Make source compilable with C++17
Changes applied: - Removing "register" keyword - Fixing const pointer to pointer assignments - Adding type casts to rb_malloc calls
Diffstat (limited to 'mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c')
-rw-r--r--mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c
index 5984b623b..0a864567d 100644
--- a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c
+++ b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c
@@ -133,7 +133,7 @@ typedef struct listcmd_parser_state {
static listcmd_parser_state*
listcmd_parser_state_new(mrb_state *mrb)
{
- listcmd_parser_state *st = mrb_malloc(mrb, sizeof(listcmd_parser_state));
+ listcmd_parser_state *st = (listcmd_parser_state*)mrb_malloc(mrb, sizeof(listcmd_parser_state));
memset(st, 0, sizeof(listcmd_parser_state));
return st;
}
@@ -227,7 +227,7 @@ parse_filename(mrb_state *mrb, char **sp, listcmd_parser_state *st)
}
if (len > 0) {
- st->filename = mrb_malloc(mrb, len + 1);
+ st->filename = (char*)mrb_malloc(mrb, len + 1);
strncpy(st->filename, *sp, len);
st->filename[len] = '\0';
*sp += len;
@@ -242,7 +242,8 @@ char*
replace_ext(mrb_state *mrb, const char *filename, const char *ext)
{
size_t len;
- char *p, *s;
+ const char *p;
+ char *s;
if (filename == NULL) {
return NULL;
@@ -255,7 +256,7 @@ replace_ext(mrb_state *mrb, const char *filename, const char *ext)
len = strlen(filename);
}
- s = mrb_malloc(mrb, len + strlen(ext) + 1);
+ s = (char*)mrb_malloc(mrb, len + strlen(ext) + 1);
memset(s, '\0', len + strlen(ext) + 1);
strncpy(s, filename, len);
strcat(s, ext);
@@ -325,7 +326,7 @@ parse_listcmd_args(mrb_state *mrb, mrdb_state *mrdb, listcmd_parser_state *st)
static mrb_bool
check_cmd_pattern(const char *pattern, const char *cmd)
{
- char *lbracket, *rbracket, *p, *q;
+ const char *lbracket, *rbracket, *p, *q;
if (pattern == NULL && cmd == NULL) {
return TRUE;