summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawcombined (merge: 7fa0a70 f317330)
rawcombined (merge: 7fa0a70 f317330)
| author | Yukihiro "Matz" Matsumoto <[email protected]> | |
| Tue, 6 Jul 2021 08:01:37 +0000 (6 17:01 +0900) | ||
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | |
| Tue, 6 Jul 2021 08:01:37 +0000 (6 17:01 +0900) |
*/
#include <string.h>
-#include "mruby.h"
-#include "mruby/irep.h"
+#include <mruby.h>
+#include <mruby/irep.h>
#include "mrdb.h"
-#include "mruby/debug.h"
-#include "mruby/opcode.h"
-#include "mruby/class.h"
-#include "mruby/proc.h"
-#include "mruby/variable.h"
+#include <mruby/debug.h>
+#include <mruby/opcode.h>
+#include <mruby/class.h>
+#include <mruby/proc.h>
+#include <mruby/variable.h>
#include "mrdberror.h"
#include "apibreak.h"
+ #include "apistring.h"
#define MAX_BREAKPOINTNO (MAX_BREAKPOINT * 1024)
#define MRB_DEBUG_BP_FILE_OK (0x0001)
}
/* file and lineno check (line type mrb_debug_line_ary only.) */
- result = check_file_lineno( dbg->root_irep, file, lineno );
- if(result == 0) {
+ result = check_file_lineno(mrb, dbg->root_irep, file, lineno);
+ if (result == 0) {
return MRB_DEBUG_BREAK_INVALID_FILE;
- }else if(result == MRB_DEBUG_BP_FILE_OK) {
+ }
+ else if (result == MRB_DEBUG_BP_FILE_OK) {
return MRB_DEBUG_BREAK_INVALID_LINENO;
- }
+ }
- set_file = (char*)mrb_malloc(mrb, len);
+ len = strlen(file) + 1;
- if(set_file == NULL) {
- return MRB_DEBUG_NOBUF;
- }
+ set_file = mrb_debug_strdup(mrb, file);
index = dbg->bpnum;
dbg->bp[index].bpno = dbg->next_bpno;
int32_t index;
char* set_class;
char* set_method;
- size_t len;
- if((mrb == NULL) || (dbg == NULL) || (method_name == NULL)) {
+ if ((mrb == NULL) || (dbg == NULL) || (method_name == NULL)) {
return MRB_DEBUG_INVALID_ARGUMENT;
}
return MRB_DEBUG_BREAK_NO_OVER;
}
- if(class_name != NULL) {
+ if (class_name != NULL) {
- len = strlen(class_name) + 1;
- set_class = (char*)mrb_malloc(mrb, len);
- strncpy(set_class, class_name, len);
+ set_class = mrb_debug_strdup(mrb, class_name);
- if(set_class == NULL) {
- return MRB_DEBUG_NOBUF;
- }
}
else {
set_class = NULL;
}
- len = strlen(method_name) + 1;
- set_method = (char*)mrb_malloc(mrb, len);
-
- strncpy(set_method, method_name, len);
+ set_method = mrb_debug_strdup(mrb, method_name);
- if(set_method == NULL) {
- if(set_class != NULL) {
- mrb_free(mrb, (void*)set_class);
- }
- return MRB_DEBUG_NOBUF;
++ if (set_method == NULL) {
++ mrb_free(mrb, set_class);
+ }
index = dbg->bpnum;
dbg->bp[index].bpno = dbg->next_bpno;
#include "mrdb.h"
#include "mrdberror.h"
#include "apilist.h"
-#include "mruby/compile.h"
-#include "mruby/irep.h"
-#include "mruby/debug.h"
+ #include "apistring.h"
+#include <mruby/compile.h>
+#include <mruby/irep.h>
+#include <mruby/debug.h>
#define LINE_BUF_SIZE MAX_COMMAND_LINE
}
p = strrchr(path, '/');
- len = p != NULL ? p - path : strlen(path);
+ len = p != NULL ? (size_t)(p - path) : strlen(path);
- dir = (char*)mrb_malloc(mrb, len + 1);
- strncpy(dir, path, len);
- dir[len] = '\0';
-
- return dir;
+ return mrb_debug_strndup(mrb, path, len);
}
static source_file*
}
file->lineno = 1;
- file->path = (char*)mrb_malloc(mrb, strlen(filename) + 1);
- strcpy(file->path, filename);
- if ((file->path = mrb_debug_strdup(mrb, filename)) == NULL) {
++ file->path = mrb_debug_strdup(mrb, filename);
++ if (file->path == NULL) {
+ source_file_free(mrb, file);
+ return NULL;
+ }
return file;
}
#include <string.h>
#include "apilist.h"
-#include "mruby/compile.h"
+ #include "apistring.h"
+#include <mruby/compile.h>
typedef struct help_msg {
const char *cmd1;