summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/irivertools/irivertools.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/irivertools/irivertools.cpp')
-rw-r--r--rbutil/rbutilqt/irivertools/irivertools.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/rbutil/rbutilqt/irivertools/irivertools.cpp b/rbutil/rbutilqt/irivertools/irivertools.cpp
index ee91193dc4..af06e86e06 100644
--- a/rbutil/rbutilqt/irivertools/irivertools.cpp
+++ b/rbutil/rbutilqt/irivertools/irivertools.cpp
@@ -59,12 +59,12 @@ bool mkboot(QString infile, QString outfile,QString bootloader,int origin,Progre
59 QFile f(infile); 59 QFile f(infile);
60 if(!f.open(QIODevice::ReadOnly)) 60 if(!f.open(QIODevice::ReadOnly))
61 { 61 {
62 dp->addItem("Could not open: %1" + infile); 62 dp->addItem("Could not open: %1" + infile,LOGERROR);
63 return false; 63 return false;
64 } 64 }
65 i = f.read((char*)image,16); 65 i = f.read((char*)image,16);
66 if(i < 16) { 66 if(i < 16) {
67 dp->addItem("reading header failed"); 67 dp->addItem("reading header failed",LOGERROR);
68 return false; 68 return false;
69 } 69 }
70 70
@@ -77,7 +77,7 @@ bool mkboot(QString infile, QString outfile,QString bootloader,int origin,Progre
77 len = binary_length+0x200-16; 77 len = binary_length+0x200-16;
78 i = f.read((char*)image+16, len); 78 i = f.read((char*)image+16, len);
79 if(i < len) { 79 if(i < len) {
80 dp->addItem("reading firmware failed"); 80 dp->addItem("reading firmware failed",LOGERROR);
81 return false; 81 return false;
82 } 82 }
83 83
@@ -86,7 +86,7 @@ bool mkboot(QString infile, QString outfile,QString bootloader,int origin,Progre
86 f.setFileName(bootloader); 86 f.setFileName(bootloader);
87 if(!f.open(QIODevice::ReadOnly)) 87 if(!f.open(QIODevice::ReadOnly))
88 { 88 {
89 dp->addItem("Could not open: %1" + bootloader); 89 dp->addItem("Could not open: %1" + bootloader,LOGERROR);
90 return false; 90 return false;
91 } 91 }
92 92
@@ -94,7 +94,7 @@ bool mkboot(QString infile, QString outfile,QString bootloader,int origin,Progre
94 94
95 i = f.read((char*)image+0x220 + origin, bllen); 95 i = f.read((char*)image+0x220 + origin, bllen);
96 if(i < bllen) { 96 if(i < bllen) {
97 dp->addItem("reading bootloader failed"); 97 dp->addItem("reading bootloader failed",LOGERROR);
98 return false; 98 return false;
99 } 99 }
100 100
@@ -102,7 +102,7 @@ bool mkboot(QString infile, QString outfile,QString bootloader,int origin,Progre
102 f.setFileName(outfile); 102 f.setFileName(outfile);
103 if(!f.open(QIODevice::WriteOnly)) 103 if(!f.open(QIODevice::WriteOnly))
104 { 104 {
105 dp->addItem("Could not open: %1" + outfile); 105 dp->addItem("Could not open: %1" + outfile,LOGERROR);
106 return false; 106 return false;
107 } 107 }
108 108
@@ -154,7 +154,7 @@ bool mkboot(QString infile, QString outfile,QString bootloader,int origin,Progre
154 154
155 i = f.write((char*)image,total_length); 155 i = f.write((char*)image,total_length);
156 if(i < total_length) { 156 if(i < total_length) {
157 dp->addItem("writing bootloader failed"); 157 dp->addItem("writing bootloader failed",LOGERROR);
158 return false; 158 return false;
159 } 159 }
160 160
@@ -226,19 +226,19 @@ int iriver_decode(QString infile_name, QString outfile_name, unsigned int modify
226 226
227 if(!infile.open(QIODevice::ReadOnly)) 227 if(!infile.open(QIODevice::ReadOnly))
228 { 228 {
229 dp->addItem("Could not open: %1" + infile_name); 229 dp->addItem("Could not open: %1" + infile_name,LOGERROR);
230 return -1; 230 return -1;
231 } 231 }
232 if(!outfile.open(QIODevice::WriteOnly)) 232 if(!outfile.open(QIODevice::WriteOnly))
233 { 233 {
234 dp->addItem("Could not open: %1" + outfile_name); 234 dp->addItem("Could not open: %1" + outfile_name,LOGERROR);
235 return -1; 235 return -1;
236 } 236 }
237 lenread = infile.read( (char*)headerdata, 512); 237 lenread = infile.read( (char*)headerdata, 512);
238 if( lenread != 512 ) 238 if( lenread != 512 )
239 { 239 {
240 dp->addItem("This doesn't look like a valid encrypted iHP" 240 dp->addItem("This doesn't look like a valid encrypted iHP"
241 "firmware - reason: header length."); 241 "firmware - reason: header length.",LOGERROR);
242 infile.close(); 242 infile.close();
243 outfile.close(); 243 outfile.close();
244 return -1; 244 return -1;
@@ -248,7 +248,7 @@ int iriver_decode(QString infile_name, QString outfile_name, unsigned int modify
248 if( i == -1 ) 248 if( i == -1 )
249 { 249 {
250 dp->addItem("This firmware is for an unknown model, or is not" 250 dp->addItem("This firmware is for an unknown model, or is not"
251 " a valid encrypted iHP firmware."); 251 " a valid encrypted iHP firmware.",LOGERROR);
252 infile.close(); 252 infile.close();
253 outfile.close(); 253 outfile.close();
254 return -1; 254 return -1;
@@ -271,7 +271,7 @@ int iriver_decode(QString infile_name, QString outfile_name, unsigned int modify
271 dwLength2+dwLength3+512 != dwLength1 ) 271 dwLength2+dwLength3+512 != dwLength1 )
272 { 272 {
273 dp->addItem("This doesn't look like a valid encrypted " 273 dp->addItem("This doesn't look like a valid encrypted "
274 "iHP firmware - reason: file 'length' data."); 274 "iHP firmware - reason: file 'length' data.",LOGERROR);
275 infile.close(); 275 infile.close();
276 outfile.close(); 276 outfile.close();
277 return -1; 277 return -1;
@@ -333,7 +333,7 @@ int iriver_decode(QString infile_name, QString outfile_name, unsigned int modify
333 if( fp != dwLength2 ) 333 if( fp != dwLength2 )
334 { 334 {
335 dp->addItem("This doesn't look like a valid encrypted " 335 dp->addItem("This doesn't look like a valid encrypted "
336 "iHP firmware - reason: 'length2' mismatch."); 336 "iHP firmware - reason: 'length2' mismatch.",LOGERROR);
337 infile.close(); 337 infile.close();
338 outfile.close(); 338 outfile.close();
339 return -1; 339 return -1;
@@ -350,7 +350,7 @@ int iriver_decode(QString infile_name, QString outfile_name, unsigned int modify
350 if( memcmp( ppChecksums, blockdata, lenread ) != 0 ) 350 if( memcmp( ppChecksums, blockdata, lenread ) != 0 )
351 { 351 {
352 dp->addItem("This doesn't look like a valid encrypted " 352 dp->addItem("This doesn't look like a valid encrypted "
353 "iHP firmware - reason: Checksum mismatch!"); 353 "iHP firmware - reason: Checksum mismatch!",LOGERROR);
354 infile.close(); 354 infile.close();
355 outfile.close(); 355 outfile.close();
356 return -1; 356 return -1;
@@ -361,7 +361,7 @@ int iriver_decode(QString infile_name, QString outfile_name, unsigned int modify
361 if( fp != dwLength3 ) 361 if( fp != dwLength3 )
362 { 362 {
363 dp->addItem("This doesn't look like a valid encrypted " 363 dp->addItem("This doesn't look like a valid encrypted "
364 "iHP firmware - reason: 'length3' mismatch."); 364 "iHP firmware - reason: 'length3' mismatch.",LOGERROR);
365 infile.close(); 365 infile.close();
366 outfile.close(); 366 outfile.close();
367 return -1; 367 return -1;
@@ -409,12 +409,12 @@ int iriver_encode(QString infile_name, QString outfile_name, unsigned int modify
409 409
410 if(!infile.open(QIODevice::ReadOnly)) 410 if(!infile.open(QIODevice::ReadOnly))
411 { 411 {
412 dp->addItem("Could not open: %1" + infile_name); 412 dp->addItem("Could not open: %1" + infile_name,LOGERROR);
413 return -1; 413 return -1;
414 } 414 }
415 if(!outfile.open(QIODevice::WriteOnly)) 415 if(!outfile.open(QIODevice::WriteOnly))
416 { 416 {
417 dp->addItem("Could not open: %1" + outfile_name); 417 dp->addItem("Could not open: %1" + outfile_name,LOGERROR);
418 return -1; 418 return -1;
419 } 419 }
420 420
@@ -422,7 +422,7 @@ int iriver_encode(QString infile_name, QString outfile_name, unsigned int modify
422 if( lenread != 512 ) 422 if( lenread != 512 )
423 { 423 {
424 dp->addItem("This doesn't look like a valid decoded " 424 dp->addItem("This doesn't look like a valid decoded "
425 "iHP firmware - reason: header length."); 425 "iHP firmware - reason: header length.",LOGERROR);
426 infile.close(); 426 infile.close();
427 outfile.close(); 427 outfile.close();
428 }; 428 };
@@ -436,7 +436,7 @@ int iriver_encode(QString infile_name, QString outfile_name, unsigned int modify
436 if( i == -1 ) 436 if( i == -1 )
437 { 437 {
438 dp->addItem("This firmware is for an unknown model, or is not" 438 dp->addItem("This firmware is for an unknown model, or is not"
439 " a valid decoded iHP firmware."); 439 " a valid decoded iHP firmware.",LOGERROR);
440 infile.close(); 440 infile.close();
441 outfile.close(); 441 outfile.close();
442 }; 442 };
@@ -457,7 +457,7 @@ int iriver_encode(QString infile_name, QString outfile_name, unsigned int modify
457 dwLength2+dwLength3+512 != dwLength1 ) 457 dwLength2+dwLength3+512 != dwLength1 )
458 { 458 {
459 dp->addItem("This doesn't look like a valid decoded " 459 dp->addItem("This doesn't look like a valid decoded "
460 "iHP firmware - reason:file 'length' data."); 460 "iHP firmware - reason:file 'length' data.",LOGERROR);
461 infile.close(); 461 infile.close();
462 outfile.close(); 462 outfile.close();
463 }; 463 };
@@ -495,7 +495,7 @@ int iriver_encode(QString infile_name, QString outfile_name, unsigned int modify
495 if( fp != dwLength2 ) 495 if( fp != dwLength2 )
496 { 496 {
497 dp->addItem("This doesn't look like a valid decoded " 497 dp->addItem("This doesn't look like a valid decoded "
498 "iHP firmware - reason: 'length1' mismatch."); 498 "iHP firmware - reason: 'length1' mismatch.",LOGERROR);
499 infile.close(); 499 infile.close();
500 outfile.close(); 500 outfile.close();
501 }; 501 };
@@ -515,7 +515,7 @@ int iriver_encode(QString infile_name, QString outfile_name, unsigned int modify
515 if( fp != dwLength3 ) 515 if( fp != dwLength3 )
516 { 516 {
517 dp->addItem("This doesn't look like a valid decoded " 517 dp->addItem("This doesn't look like a valid decoded "
518 "iHP firmware - 'length2' mismatch."); 518 "iHP firmware - 'length2' mismatch.",LOGERROR);
519 infile.close(); 519 infile.close();
520 outfile.close(); 520 outfile.close();
521 }; 521 };