Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

src: more clang-format

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2022-11-27 22:03:20 +01:00
parent 02f6786b2a
commit 65a2da4b40
3 changed files with 120 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/msg.cpp
+57 -92
View File
@@ -25,10 +25,8 @@
<markus@oberhumer.com> <ezerotven+github@gmail.com>
*/
#include "conf.h"
/*************************************************************************
// FIXME: if stdout is redirected to a file and stderr is not, should
// we write all error messages to both stderr and stdout ?
@@ -36,25 +34,20 @@
static int pr_need_nl = 0;
void printSetNl(int need_nl) { pr_need_nl = need_nl; }
void printSetNl(int need_nl)
{
pr_need_nl = need_nl;
}
void printClearLine(FILE *f)
{
static char clear_line_msg[1+79+1+1];
if (!clear_line_msg[0])
{
void printClearLine(FILE *f) {
static char clear_line_msg[1 + 79 + 1 + 1];
if (!clear_line_msg[0]) {
char *msg = clear_line_msg;
msg[0] = '\r';
memset(msg+1,' ',79);
memset(msg + 1, ' ', 79);
msg[80] = '\r';
msg[81] = 0;
}
fflush(stdout); fflush(stderr);
fflush(stdout);
fflush(stderr);
if (f == nullptr)
f = stdout;
con_fprintf(f, "%s", clear_line_msg);
@@ -62,24 +55,21 @@ void printClearLine(FILE *f)
printSetNl(0);
}
static void pr_print(bool c, const char *msg)
{
static void pr_print(bool c, const char *msg) {
if (c && !opt->to_stdout)
con_fprintf(stderr, "%s", msg);
else
fprintf(stderr, "%s", msg);
}
static void pr_error(const char *iname, const char *msg, bool is_warning)
{
fflush(stdout); fflush(stderr);
static void pr_error(const char *iname, const char *msg, bool is_warning) {
fflush(stdout);
fflush(stderr);
char buf[1024];
buf[0] = 0;
if (pr_need_nl == 2)
printClearLine(stdout);
else if (pr_need_nl)
{
else if (pr_need_nl) {
buf[0] = '\n';
buf[1] = 0;
printSetNl(0);
@@ -90,35 +80,34 @@ static void pr_error(const char *iname, const char *msg, bool is_warning)
// At least I can use some colors then...
bool c = acc_isatty(STDERR_FILENO) ? 1 : 0;
int fg = con_fg(stderr,FG_BRTRED);
snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),"%s: ", progname);
pr_print(c,buf);
int fg = con_fg(stderr, FG_BRTRED);
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s: ", progname);
pr_print(c, buf);
//(void)con_fg(stderr,FG_RED);
snprintf(buf,sizeof(buf),"%s: ", iname);
pr_print(c,buf);
snprintf(buf, sizeof(buf), "%s: ", iname);
pr_print(c, buf);
//(void)con_fg(stderr,FG_BRTRED);
pr_print(c,msg);
pr_print(c,"\n");
fflush(stdout); fflush(stderr);
fg = con_fg(stderr,fg);
pr_print(c, msg);
pr_print(c, "\n");
fflush(stdout);
fflush(stderr);
fg = con_fg(stderr, fg);
UNUSED(is_warning);
UNUSED(fg);
}
void printErr(const char *iname, const Throwable *e)
{
void printErr(const char *iname, const Throwable *e) {
char buf[1024];
size_t l;
snprintf(buf, sizeof(buf), "%s", prettyName(typeid(*e).name()));
l = strlen(buf);
if (l < sizeof(buf) && e->getMsg())
snprintf(buf+l, sizeof(buf)-l, ": %s", e->getMsg());
snprintf(buf + l, sizeof(buf) - l, ": %s", e->getMsg());
l = strlen(buf);
if (l < sizeof(buf) && e->getErrno()) {
snprintf(buf+l, sizeof(buf)-l, ": %s", strerror(e->getErrno()));
snprintf(buf + l, sizeof(buf) - l, ": %s", strerror(e->getErrno()));
#if 1
// some compilers (e.g. Borland C++) put a trailing '\n'
// into strerror() result
@@ -127,127 +116,103 @@ void printErr(const char *iname, const Throwable *e)
buf[l] = 0;
#endif
}
pr_error(iname,buf,e->isWarning());
pr_error(iname, buf, e->isWarning());
}
void printErr(const char *iname, const char *format, ...)
{
void printErr(const char *iname, const char *format, ...) {
va_list args;
char buf[1024];
va_start(args,format);
upx_safe_vsnprintf(buf,sizeof(buf),format,args);
va_start(args, format);
upx_safe_vsnprintf(buf, sizeof(buf), format, args);
va_end(args);
pr_error(iname,buf,false);
pr_error(iname, buf, false);
}
void printWarn(const char *iname, const char *format, ...)
{
void printWarn(const char *iname, const char *format, ...) {
va_list args;
char buf[1024];
va_start(args,format);
upx_safe_vsnprintf(buf,sizeof(buf),format,args);
va_start(args, format);
upx_safe_vsnprintf(buf, sizeof(buf), format, args);
va_end(args);
pr_error(iname,buf,true);
pr_error(iname, buf, true);
}
void printUnhandledException(const char *iname, const std::exception *e)
{
void printUnhandledException(const char *iname, const std::exception *e) {
if (e)
printErr(iname,"unhandled exception: %s\n", prettyName(e->what()));
printErr(iname, "unhandled exception: %s\n", prettyName(e->what()));
else
printErr(iname,"internal error: unhandled exception!\n");
if (opt->cmd != CMD_COMPRESS)
{
printErr(iname," this file has possibly been modified/hacked; take care!\n");
printErr(iname, "internal error: unhandled exception!\n");
if (opt->cmd != CMD_COMPRESS) {
printErr(iname, " this file has possibly been modified/hacked; take care!\n");
}
}
/*************************************************************************
// FIXME: should use colors and a consistent layout here
**************************************************************************/
static int info_header = 0;
static void info_print(const char *msg)
{
static void info_print(const char *msg) {
if (opt->info_mode <= 0)
return;
FILE *f = opt->to_stdout ? stderr : stdout;
if (pr_need_nl)
{
if (pr_need_nl) {
printClearLine(f);
con_fprintf(f,"%s\n",msg);
}
else if (pr_need_nl)
con_fprintf(f,"\n%s\n",msg);
con_fprintf(f, "%s\n", msg);
} else if (pr_need_nl)
con_fprintf(f, "\n%s\n", msg);
else
con_fprintf(f,"%s\n",msg);
con_fprintf(f, "%s\n", msg);
fflush(f);
printSetNl(0);
}
void infoHeader() { info_header = 0; }
void infoHeader()
{
info_header = 0;
}
void infoHeader(const char *format, ...)
{
void infoHeader(const char *format, ...) {
if (opt->info_mode <= 0)
return;
va_list args;
char buf[1024];
va_start(args,format);
upx_safe_vsnprintf(buf,sizeof(buf),format,args);
va_start(args, format);
upx_safe_vsnprintf(buf, sizeof(buf), format, args);
va_end(args);
info_print(buf);
info_header = 1;
}
void info(const char *format, ...)
{
void info(const char *format, ...) {
if (opt->info_mode <= 0)
return;
va_list args;
char buf[1024];
const int n = 4 * info_header;
memset(buf, ' ', n);
va_start(args,format);
upx_safe_vsnprintf(buf+n,sizeof(buf)-n,format,args);
va_start(args, format);
upx_safe_vsnprintf(buf + n, sizeof(buf) - n, format, args);
va_end(args);
info_print(buf);
}
void infoWarning(const char *format, ...)
{
if (opt->info_mode <= 0)
{
void infoWarning(const char *format, ...) {
if (opt->info_mode <= 0) {
// FIXME - should still print something here
return;
}
va_list args;
char buf[1024];
va_start(args,format);
upx_safe_vsnprintf(buf,sizeof(buf),format,args);
va_start(args, format);
upx_safe_vsnprintf(buf, sizeof(buf), format, args);
va_end(args);
info("[WARNING] %s\n", buf);
}
void infoWriting(const char *what, long size)
{
void infoWriting(const char *what, long size) {
if (opt->info_mode <= 0)
return;
info("Writing %s: %ld bytes", what, size);