22
22
23
23
#include " llvm/Support/FileSystem.h"
24
24
#include " llvm/Support/FileUtilities.h"
25
+ #include " llvm/Support/WithColor.h"
25
26
#include " llvm/Support/raw_ostream.h"
26
27
27
28
#include " Acceptor.h"
@@ -202,14 +203,15 @@ int main_platform(int argc, char *argv[]) {
202
203
203
204
case ' p' : {
204
205
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 " ;
206
207
option_error = 4 ;
207
208
break ;
208
209
}
209
210
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);
213
215
option_error = 5 ;
214
216
}
215
217
} break ;
@@ -219,14 +221,15 @@ int main_platform(int argc, char *argv[]) {
219
221
case ' M' : {
220
222
uint16_t portnum;
221
223
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 " ;
223
225
option_error = 2 ;
224
226
break ;
225
227
}
226
228
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);
230
233
option_error = 1 ;
231
234
break ;
232
235
}
@@ -253,9 +256,10 @@ int main_platform(int argc, char *argv[]) {
253
256
gdbserver_portmap = GDBRemoteCommunicationServerPlatform::PortMap (
254
257
min_gdbserver_port, max_gdbserver_port);
255
258
} 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);
259
263
option_error = 3 ;
260
264
}
261
265
@@ -317,7 +321,7 @@ int main_platform(int argc, char *argv[]) {
317
321
Connection *conn = nullptr ;
318
322
error = acceptor_up->Accept (children_inherit_accept_socket, conn);
319
323
if (error.Fail ()) {
320
- printf ( " error: %s \n " , error.AsCString ()) ;
324
+ WithColor::error () << error.AsCString () << ' \n ' ;
321
325
exit (socket_error);
322
326
}
323
327
printf (" Connection established.\n " );
@@ -372,10 +376,10 @@ int main_platform(int argc, char *argv[]) {
372
376
}
373
377
374
378
if (error.Fail ()) {
375
- fprintf (stderr, " error: %s \n " , error.AsCString ()) ;
379
+ WithColor::error () << error.AsCString () << ' \n ' ;
376
380
}
377
381
} else {
378
- fprintf (stderr, " error: handshake with client failed\n " ) ;
382
+ WithColor::error () << " handshake with client failed\n " ;
379
383
}
380
384
}
381
385
} while (g_server);
0 commit comments