Skip to content

Commit 984e2f4

Browse files
committed
[lldb] Prints error using WithColor::error in lldb-platform
1 parent eee3090 commit 984e2f4

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

lldb/tools/lldb-server/lldb-platform.cpp

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
#include "llvm/Support/FileSystem.h"
2424
#include "llvm/Support/FileUtilities.h"
25+
#include "llvm/Support/WithColor.h"
2526
#include "llvm/Support/raw_ostream.h"
2627

2728
#include "Acceptor.h"
@@ -202,14 +203,15 @@ int main_platform(int argc, char *argv[]) {
202203

203204
case 'p': {
204205
if (!llvm::to_integer(optarg, port_offset)) {
205-
llvm::errs() << "error: invalid port offset string " << optarg << "\n";
206+
WithColor::error() << "invalid port offset string " << optarg << "\n";
206207
option_error = 4;
207208
break;
208209
}
209210
if (port_offset < LOW_PORT || port_offset > HIGH_PORT) {
210-
llvm::errs() << llvm::formatv("error: port offset {0} is not in the "
211-
"valid user port range of {1} - {2}\n",
212-
port_offset, LOW_PORT, HIGH_PORT);
211+
WithColor::error() << llvm::formatv(
212+
"port offset {0} is not in the "
213+
"valid user port range of {1} - {2}\n",
214+
port_offset, LOW_PORT, HIGH_PORT);
213215
option_error = 5;
214216
}
215217
} break;
@@ -219,14 +221,15 @@ int main_platform(int argc, char *argv[]) {
219221
case 'M': {
220222
uint16_t portnum;
221223
if (!llvm::to_integer(optarg, portnum)) {
222-
llvm::errs() << "error: invalid port number string " << optarg << "\n";
224+
WithColor::error() << "invalid port number string " << optarg << "\n";
223225
option_error = 2;
224226
break;
225227
}
226228
if (portnum < LOW_PORT || portnum > HIGH_PORT) {
227-
llvm::errs() << llvm::formatv("error: port number {0} is not in the "
228-
"valid user port range of {1} - {2}\n",
229-
portnum, LOW_PORT, HIGH_PORT);
229+
WithColor::error() << llvm::formatv(
230+
"port number {0} is not in the "
231+
"valid user port range of {1} - {2}\n",
232+
portnum, LOW_PORT, HIGH_PORT);
230233
option_error = 1;
231234
break;
232235
}
@@ -253,9 +256,10 @@ int main_platform(int argc, char *argv[]) {
253256
gdbserver_portmap = GDBRemoteCommunicationServerPlatform::PortMap(
254257
min_gdbserver_port, max_gdbserver_port);
255258
} else if (min_gdbserver_port || max_gdbserver_port) {
256-
fprintf(stderr, "error: --min-gdbserver-port (%u) is not lower than "
257-
"--max-gdbserver-port (%u)\n",
258-
min_gdbserver_port, max_gdbserver_port);
259+
WithColor::error() << llvm::formatv(
260+
"--min-gdbserver-port ({0}) is not lower than "
261+
"--max-gdbserver-port ({1})\n",
262+
min_gdbserver_port, max_gdbserver_port);
259263
option_error = 3;
260264
}
261265

@@ -317,7 +321,7 @@ int main_platform(int argc, char *argv[]) {
317321
Connection *conn = nullptr;
318322
error = acceptor_up->Accept(children_inherit_accept_socket, conn);
319323
if (error.Fail()) {
320-
printf("error: %s\n", error.AsCString());
324+
WithColor::error() << error.AsCString() << '\n';
321325
exit(socket_error);
322326
}
323327
printf("Connection established.\n");
@@ -372,10 +376,10 @@ int main_platform(int argc, char *argv[]) {
372376
}
373377

374378
if (error.Fail()) {
375-
fprintf(stderr, "error: %s\n", error.AsCString());
379+
WithColor::error() << error.AsCString() << '\n';
376380
}
377381
} else {
378-
fprintf(stderr, "error: handshake with client failed\n");
382+
WithColor::error() << "handshake with client failed\n";
379383
}
380384
}
381385
} while (g_server);

0 commit comments

Comments
 (0)