i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strace: Do not print unnecessary parentheses.

Browse Source 
Cleans up output somewhat.
This commit is contained in:
Augustin Cavalier
2023-03-28 13:36:18 -04:00
parent 0166c1efdd
commit 8b9267565d
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/debug/strace/strace.cpp
+15 -7
View File
@@ -386,16 +386,18 @@ print_syscall(FILE *outputFile, Syscall* syscall, debug_pre_syscall &message,
// print syscall name, without the "_kern_" // print syscall name, without the "_kern_"
if (colorize) { if (colorize) {
print_to_string(&string, &length, "[%6" B_PRId32 "] %s%s%s(", print_to_string(&string, &length, "[%6" B_PRId32 "] %s%s%s",
message.origin.thread, kTerminalTextBlue, message.origin.thread, kTerminalTextBlue,
syscall->Name().c_str() + 6, kTerminalTextNormal); syscall->Name().c_str() + 6, kTerminalTextNormal);
} else { } else {
print_to_string(&string, &length, "[%6" B_PRId32 "] %s(", print_to_string(&string, &length, "[%6" B_PRId32 "] %s",
message.origin.thread, syscall->Name().c_str() + 6); message.origin.thread, syscall->Name().c_str() + 6);
} }
// print arguments // print arguments
if (printArguments) { if (printArguments) {
print_to_string(&string, &length, "(");
int32 count = syscall->CountParameters(); int32 count = syscall->CountParameters();
for (int32 i = 0; i < count; i++) { for (int32 i = 0; i < count; i++) {
// get the value // get the value
@@ -410,9 +412,9 @@ print_syscall(FILE *outputFile, Syscall* syscall, debug_pre_syscall &message,
print_to_string(&string, &length, (i > 0 ? ", %s" : "%s"), print_to_string(&string, &length, (i > 0 ? ", %s" : "%s"),
value.c_str()); value.c_str());
} }
}
print_to_string(&string, &length, ")"); print_to_string(&string, &length, ")");
}
print_buffer(outputFile, buffer, sizeof(buffer) - length); print_buffer(outputFile, buffer, sizeof(buffer) - length);
} }
@@ -474,22 +476,28 @@ print_syscall(FILE *outputFile, Syscall* syscall, debug_post_syscall &message,
if (printArguments) { if (printArguments) {
int32 count = syscall->CountParameters(); int32 count = syscall->CountParameters();
int added = 0; int added = 0;
print_to_string(&string, &length, " ("); bool printedParen = false;
for (int32 i = 0; i < count; i++) { for (int32 i = 0; i < count; i++) {
// get the value // get the value
Parameter *parameter = syscall->ParameterAt(i); Parameter *parameter = syscall->ParameterAt(i);
if (!parameter->InOut() && !parameter->Out()) if (!parameter->InOut() && !parameter->Out())
continue; continue;
TypeHandler *handler = parameter->Handler(); TypeHandler *handler = parameter->Handler();
::string value = ::string value =
handler->GetParameterValue(ctx, parameter, handler->GetParameterValue(ctx, parameter,
ctx.GetValue(parameter)); ctx.GetValue(parameter));
if (!printedParen) {
print_to_string(&string, &length, " (");
printedParen = true;
}
print_to_string(&string, &length, (added > 0 ? ", %s" : "%s"), print_to_string(&string, &length, (added > 0 ? ", %s" : "%s"),
value.c_str()); value.c_str());
added++; added++;
} }
print_to_string(&string, &length, ")"); if (printedParen)
print_to_string(&string, &length, ")");
} }
if (colorize) { if (colorize) {