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

upx-clang-format -i ui.h

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2016-09-21 21:35:13 +02:00
parent 3765ca4e92
commit 189ab8c8e8
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile
+1 -1
View File
@@ -132,7 +132,7 @@ endif
CLANG_FORMAT_FILES += s_djgpp2.cpp s_object.cpp s_vcsa.cpp s_win32.cpp screen.h CLANG_FORMAT_FILES += s_djgpp2.cpp s_object.cpp s_vcsa.cpp s_win32.cpp screen.h
CLANG_FORMAT_FILES += snprintf.cpp CLANG_FORMAT_FILES += snprintf.cpp
CLANG_FORMAT_FILES += stdcxx.h stdcxx.cpp CLANG_FORMAT_FILES += stdcxx.h stdcxx.cpp
CLANG_FORMAT_FILES += util.h CLANG_FORMAT_FILES += ui.h util.h
clang-format: clang-format:
$(top_srcdir)/src/stub/scripts/upx-clang-format -i $(addprefix $(top_srcdir)/src/,$(CLANG_FORMAT_FILES)) $(top_srcdir)/src/stub/scripts/upx-clang-format -i $(addprefix $(top_srcdir)/src/,$(CLANG_FORMAT_FILES))
.PHONY: clang-format .PHONY: clang-format
src/ui.h
+9 -16
View File
@@ -25,7 +25,6 @@
<markus@oberhumer.com> <ml1050@users.sourceforge.net> <markus@oberhumer.com> <ml1050@users.sourceforge.net>
*/ */
#ifndef __UPX_UI_H #ifndef __UPX_UI_H
#define __UPX_UI_H 1 #define __UPX_UI_H 1
@@ -34,22 +33,21 @@ class OutputFile;
class Packer; class Packer;
class UiPacker; class UiPacker;
/************************************************************************* /*************************************************************************
// //
**************************************************************************/ **************************************************************************/
class UiPacker class UiPacker {
{
public: public:
UiPacker(const Packer *p_); UiPacker(const Packer *p_);
public: public:
virtual ~UiPacker(); virtual ~UiPacker();
static void uiConfirmUpdate(); static void uiConfirmUpdate();
static void uiPackTotal(); static void uiPackTotal();
static void uiUnpackTotal(); static void uiUnpackTotal();
static void uiListTotal(bool uncompress=false); static void uiListTotal(bool uncompress = false);
static void uiTestTotal(); static void uiTestTotal();
static void uiFileInfoTotal(); static void uiFileInfoTotal();
@@ -59,7 +57,7 @@ public:
virtual void uiUnpackStart(const OutputFile *fo); virtual void uiUnpackStart(const OutputFile *fo);
virtual void uiUnpackEnd(const OutputFile *fo); virtual void uiUnpackEnd(const OutputFile *fo);
virtual void uiListStart(); virtual void uiListStart();
virtual void uiList(long fu=-1); virtual void uiList(long fu = -1);
virtual void uiListEnd(); virtual void uiListEnd();
virtual void uiTestStart(); virtual void uiTestStart();
virtual void uiTestEnd(); virtual void uiTestEnd();
@@ -67,19 +65,19 @@ public:
virtual void uiFileInfoEnd(); virtual void uiFileInfoEnd();
// callback // callback
virtual void startCallback(unsigned u_len, unsigned step, virtual void startCallback(unsigned u_len, unsigned step, int pass, int total_passes);
int pass, int total_passes);
virtual void firstCallback(); virtual void firstCallback();
virtual void finalCallback(unsigned u_len, unsigned c_len); virtual void finalCallback(unsigned u_len, unsigned c_len);
virtual void endCallback(); virtual void endCallback();
virtual void endCallback(bool done); virtual void endCallback(bool done);
virtual upx_callback_t *getCallback() { return &cb; } virtual upx_callback_t *getCallback() { return &cb; }
protected: protected:
static void __acc_cdecl progress_callback(upx_callback_p cb, unsigned, unsigned); static void __acc_cdecl progress_callback(upx_callback_p cb, unsigned, unsigned);
virtual void doCallback(unsigned isize, unsigned osize); virtual void doCallback(unsigned isize, unsigned osize);
protected: protected:
virtual void uiUpdate(long fc=-1, long fu=-1); virtual void uiUpdate(long fc = -1, long fu = -1);
public: public:
static void uiHeader(); static void uiHeader();
@@ -89,7 +87,7 @@ public:
int ui_total_passes; int ui_total_passes;
protected: protected:
virtual void printInfo(int nl=0); virtual void printInfo(int nl = 0);
const Packer *p; const Packer *p;
// callback // callback
@@ -112,11 +110,6 @@ protected:
static long update_fu_len; static long update_fu_len;
}; };
#endif /* already included */ #endif /* already included */
/* vim:set ts=4 sw=4 et: */
/*
vi:ts=4:et
*/