Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove agft tiny graph edges on by default #10167

Merged
merged 2 commits into from May 24, 2018

Conversation

@cyanpencil
Copy link
Contributor

@cyanpencil cyanpencil commented May 23, 2018

This should close #9962

Now agft, and other commands which print tiny graphs to stdout (not interactive) won't print tiny graph edges.

Also refactored some code to use r_core_cmdf which is a lot more cleaner than constructing strings and then passing them to r_core_cmd0

@XVilka
Copy link
Contributor

@XVilka XVilka commented May 23, 2018

Failed test:

Diff: --- /tmp/r2-regressions//cmd_project-R1BFVr/exp	2018-05-23 09:05:30.610455644 +0000
+++ /tmp/r2-regressions//cmd_project-R1BFVr/out	2018-05-23 09:05:30.642456235 +0000
@@ -1,3 +1,3 @@
-37
-3
-5
+0
+2
+1
[  ]  19  cmd_types: tp                            
[XX]
@cyanpencil cyanpencil force-pushed the cyanpencil:agft-fix-edges branch from c11b54d to fd9139d May 23, 2018
@cyanpencil
Copy link
Contributor Author

@cyanpencil cyanpencil commented May 23, 2018

Ok green now, it was a problem with rebasing

@cyanpencil cyanpencil changed the title Remove agft tiny graph edges Remove agft tiny graph edges on by default May 23, 2018
}
free (cmd);
ut64 addr = input[2] ? r_num_math (core->num, input + 2) : core->offset;
r_core_cmdf (core, "ag-; .agx* %lld; agg%c;", addr, input[1]);

This comment has been minimized.

@radare

radare May 23, 2018
Collaborator

use PFMT64d

r_core_cmd0 (core, cmd);
}
ut64 addr = input[2] ? r_num_math (core->num, input + 2) : core->offset;
r_core_cmdf (core, "ag-; .agc* %lld; agg%c;", addr, input[1]);

This comment has been minimized.

@radare

radare May 23, 2018
Collaborator

use PFMT64d

}
free (cmd);
ut64 addr = input[2] ? r_num_math (core->num, input + 2): core->offset;
r_core_cmdf (core, "ag-; .aga* %lld; agg%c;", addr, input[1]);

This comment has been minimized.

@radare

radare May 23, 2018
Collaborator

use PFMT64d

@@ -5722,7 +5722,10 @@ static void cmd_agraph_print(RCore *core, const char *input) {
break;
case 't':// "aggt" - tiny graph
core->graph->is_tiny = true;
int e = r_config_get_i (core->config, "graph.edges");

This comment has been minimized.

@radare

radare May 23, 2018
Collaborator

add {} braces

@XVilka
Copy link
Contributor

@XVilka XVilka commented May 24, 2018

@cyanpencil can you please address those comments and rebase?

cyanpencil added 2 commits May 23, 2018
Refactor for cleaner command handling in cmd_anal.c

Fix aggt graph edges
Substitute again %lld with %PFMT64d
@cyanpencil cyanpencil force-pushed the cyanpencil:agft-fix-edges branch from fd9139d to 171e91b May 24, 2018
@cyanpencil
Copy link
Contributor Author

@cyanpencil cyanpencil commented May 24, 2018

Done, also changed %lld with PFMT64d from other parts of ag* code

@radare radare merged commit 02d7502 into radareorg:master May 24, 2018
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@cyanpencil cyanpencil deleted the cyanpencil:agft-fix-edges branch May 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants