Skip to content

Commit 483aba6

Browse files
committed
tools/cxbe: Run clang-format
1 parent c5d607f commit 483aba6

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

tools/cxbe/Main.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@ int main(int argc, char *argv[])
2929

3030
bool bRetail;
3131
uint32 dwTitleId = 0xFFFF0002;
32-
uint32 dwRegions = XBEIMAGE_GAME_REGION_NA | XBEIMAGE_GAME_REGION_JAPAN | XBEIMAGE_GAME_REGION_RESTOFWORLD | XBEIMAGE_GAME_REGION_MANUFACTURING;;
32+
uint32 dwRegions = XBEIMAGE_GAME_REGION_NA | XBEIMAGE_GAME_REGION_JAPAN |
33+
XBEIMAGE_GAME_REGION_RESTOFWORLD | XBEIMAGE_GAME_REGION_MANUFACTURING;
34+
;
3335
uint32 dwVersion;
3436

3537
const char *program = argv[0];
3638
const char *program_desc = "CXBE EXE to XBE (win32 to Xbox) Relinker (Version: " VERSION ")";
37-
Option options[] = {
38-
{ szExeFilename, NULL, "exefile" },
39-
{ szXbeFilename, "OUT", "filename" },
40-
{ szDumpFilename, "DUMPINFO", "filename" },
41-
{ szXbeTitle, "TITLE", "title" },
42-
{ szXbeTitleID, "TITLEID", "{%c%c-%u|%x}" },
43-
{ szXbeRegions, "REGION",
44-
"{-|[n][j][w][m]}\n"
45-
" -=none, n=North America, j=Japan, w=world, m=manufacturing" },
46-
{ szXbeVersion, "VERSION", "version" },
47-
{ szMode, "MODE", "{debug|retail}" },
48-
{ szLogo, "LOGO", "filename" },
49-
{ szDebugPath, "DEBUGPATH", "path" },
50-
{ NULL }
51-
};
39+
Option options[] = { { szExeFilename, NULL, "exefile" },
40+
{ szXbeFilename, "OUT", "filename" },
41+
{ szDumpFilename, "DUMPINFO", "filename" },
42+
{ szXbeTitle, "TITLE", "title" },
43+
{ szXbeTitleID, "TITLEID", "{%c%c-%u|%x}" },
44+
{ szXbeRegions, "REGION",
45+
"{-|[n][j][w][m]}\n"
46+
" -=none, n=North America, j=Japan, w=world, m=manufacturing" },
47+
{ szXbeVersion, "VERSION", "version" },
48+
{ szMode, "MODE", "{debug|retail}" },
49+
{ szLogo, "LOGO", "filename" },
50+
{ szDebugPath, "DEBUGPATH", "path" },
51+
{ NULL } };
5252

5353
if(ParseOptions(argv, argc, options, szErrorMessage))
5454
{
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
9191
{
9292
char titlechar[2];
9393
unsigned titleno;
94-
if (sscanf(szXbeTitleID, "%c%c-%u", &titlechar[0], &titlechar[1], &titleno) != 3)
94+
if(sscanf(szXbeTitleID, "%c%c-%u", &titlechar[0], &titlechar[1], &titleno) != 3)
9595
{
9696
strncpy(szErrorMessage, "invalid TITLEID", ERROR_LEN);
9797
goto cleanup;
@@ -183,8 +183,8 @@ int main(int argc, char *argv[])
183183
LogoPtr = &logo;
184184
}
185185

186-
Xbe *XbeFile =
187-
new Xbe(ExeFile, szXbeTitle, dwTitleId, dwRegions, dwVersion, bRetail, LogoPtr, szDebugPath);
186+
Xbe *XbeFile = new Xbe(
187+
ExeFile, szXbeTitle, dwTitleId, dwRegions, dwVersion, bRetail, LogoPtr, szDebugPath);
188188

189189
if(XbeFile->GetError() != 0)
190190
{

tools/cxbe/Xbe.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ static size_t BasenameOffset(const std::string &path)
3333

3434
// construct via Exe file object
3535
Xbe::Xbe(class Exe *x_Exe, const char *x_szTitle, uint32 x_dwTitleID, uint32 x_dwRegions,
36-
uint32 x_dwVersion, bool x_bRetail, const std::vector<uint08> *logo, const char *x_szDebugPath)
36+
uint32 x_dwVersion, bool x_bRetail, const std::vector<uint08> *logo,
37+
const char *x_szDebugPath)
3738
{
3839
ConstructorInit();
3940

tools/cxbe/Xbe.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ class Xbe : public Error
2727
public:
2828
// construct via Exe file object
2929
Xbe(class Exe *x_Exe, const char *x_szTitle, uint32 x_dwTitleID, uint32 x_dwRegions,
30-
uint32 x_dwVersion, bool x_bRetail, const std::vector<uint08> *logo = nullptr, const char *x_szDebugPath = nullptr);
30+
uint32 x_dwVersion, bool x_bRetail, const std::vector<uint08> *logo = nullptr,
31+
const char *x_szDebugPath = nullptr);
3132

3233
// deconstructor
3334
~Xbe();

0 commit comments

Comments
 (0)