Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-26 17:15:38 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Uniform name RUndos -> RIOUndos (for bindings)

Browse Source
This commit is contained in:
Anton Kochkov 2016-06-02 07:34:06 +03:00
parent d3394d5a7a
commit 68ef35f635
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libr/core/cmd_seek.c
View File

@ -298,7 +298,7 @@ static int cmd_seek(void *data, const char *input) {
r_io_sundo_push (core->io, core->offset, r_print_get_cursor (core->print));
r_core_seek_delta (core, delta);
} else {
RUndos *undo = r_io_sundo_redo (core->io);
RIOUndos *undo = r_io_sundo_redo (core->io);
if (undo != NULL)
r_core_seek (core, undo->off, 0);
}
@ -309,7 +309,7 @@ static int cmd_seek(void *data, const char *input) {
r_io_sundo_push (core->io, core->offset, r_print_get_cursor (core->print));
r_core_seek_delta (core, delta);
} else {
RUndos *undo = r_io_sundo (core->io, core->offset);
RIOUndos *undo = r_io_sundo (core->io, core->offset);
if (undo) {
r_core_seek (core, undo->off, 0);
}

4
libr/core/graph.c
View File

@ -2774,7 +2774,7 @@ R_API int r_core_visual_graph(RCore *core, RAGraph *g, RAnalFunction *_fcn, int
case 'u':
{
if (!fcn) break;
RUndos *undo = r_io_sundo (core->io, core->offset);
RIOUndos *undo = r_io_sundo (core->io, core->offset);
if (undo) {
r_core_seek (core, undo->off, 0);
}
@ -2784,7 +2784,7 @@ R_API int r_core_visual_graph(RCore *core, RAGraph *g, RAnalFunction *_fcn, int
case 'U':
{
if (!fcn) break;
RUndos *undo = r_io_sundo_redo (core->io);
RIOUndos *undo = r_io_sundo_redo (core->io);
if (undo != NULL) r_core_seek (core, undo->off, 0);
else eprintf ("Cannot redo\n");
break;

4
libr/core/visual.c
View File

@ -1814,7 +1814,7 @@ R_API int r_core_visual_cmd(RCore *core, int ch) {
break;
case 'u':
{
RUndos *undo = r_io_sundo (core->io, core->offset);
RIOUndos *undo = r_io_sundo (core->io, core->offset);
if (undo) {
r_core_visual_seek_animation (core, undo->off);
core->print->cur = undo->cursor;
@ -1825,7 +1825,7 @@ R_API int r_core_visual_cmd(RCore *core, int ch) {
break;
case 'U':
{
RUndos *undo = r_io_sundo_redo (core->io);
RIOUndos *undo = r_io_sundo_redo (core->io);
if (undo) {
r_core_visual_seek_animation (core, undo->off);
reset_print_cur (core->print);

8
libr/include/r_io.h
View File

@ -87,7 +87,7 @@ typedef struct {
typedef struct r_undo_t {
ut64 off;
int cursor;
} RUndos;
} RIOUndos;
/* stores write and seek changes */
#define R_IO_UNDOS 64
@ -101,7 +101,7 @@ typedef struct r_io_undo_t {
int idx;
int undos; /* available undos */
int redos; /* available redos */
RUndos seek[R_IO_UNDOS];
RIOUndos seek[R_IO_UNDOS];
/*int fd[R_IO_UNDOS]; // XXX: Must be RIODesc* */
} RIOUndo;
@ -428,8 +428,8 @@ R_API RIOSection * r_io_section_get_first_in_paddr_range(RIO *io, ut64 addr, ut6
R_API int r_io_undo_init(RIO *io);
R_API void r_io_undo_enable(RIO *io, int seek, int write);
/* seek undo */
R_API RUndos *r_io_sundo(RIO *io, ut64 offset);
R_API RUndos *r_io_sundo_redo(RIO *io);
R_API RIOUndos *r_io_sundo(RIO *io, ut64 offset);
R_API RIOUndos *r_io_sundo_redo(RIO *io);
R_API void r_io_sundo_push(RIO *io, ut64 off, int cursor);
R_API void r_io_sundo_reset(RIO *io);
R_API void r_io_sundo_list(RIO *io, int mode);

12
libr/io/undo.c
View File

@ -29,8 +29,8 @@ R_API void r_io_undo_enable(RIO *io, int s, int w) {
/* undo seekz */
R_API RUndos *r_io_sundo(RIO *io, ut64 offset) {
RUndos *undo;
R_API RIOUndos *r_io_sundo(RIO *io, ut64 offset) {
RIOUndos *undo;
if (!io->undo.s_enable || !io->undo.undos)
return NULL;
@ -51,8 +51,8 @@ R_API RUndos *r_io_sundo(RIO *io, ut64 offset) {
return undo;
}
R_API RUndos *r_io_sundo_redo(RIO *io) {
RUndos *undo;
R_API RIOUndos *r_io_sundo_redo(RIO *io) {
RIOUndos *undo;
if (!io->undo.s_enable || !io->undo.redos)
return NULL;
@ -68,7 +68,7 @@ R_API RUndos *r_io_sundo_redo(RIO *io) {
R_API void r_io_sundo_push(RIO *io, ut64 off, int cursor) {
if (!io->undo.s_enable) return;
RUndos *undo;
RIOUndos *undo;
//the first insert
if (io->undo.idx > 0) {
undo = &io->undo.seek[io->undo.idx - 1];
@ -121,7 +121,7 @@ R_API void r_io_sundo_list(RIO *io, int mode) {
}
for (i = start; i < end || j == 0; i = (i + 1) % R_IO_UNDOS) {
int idx = (j< undos)? undos - j - 1: j - undos - 1;
RUndos *undo = &io->undo.seek[i];
RIOUndos *undo = &io->undo.seek[i];
ut64 addr = undo->off;
ut64 notLast = j+1<undos && (i != end - 1);
switch (mode) {