HeeroYui/HexViewer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] start reading ok

Browse Source
This commit is contained in:
Edouard DUPIN 2013-02-12 16:51:56 +01:00
parent a1b692e60b
commit 8e54450ca4
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -96,3 +96,7 @@ package: all
@#cp -vf data/*.xml package/$(PROG_NAME)/usr/share/edn/ @#cp -vf data/*.xml package/$(PROG_NAME)/usr/share/edn/
@cd package; dpkg-deb --build $(PROG_NAME) @cd package; dpkg-deb --build $(PROG_NAME)
install:
sudo cp -fv hexViewer /usr/bin/hexViewer

13
main.c
View File

@ -220,6 +220,9 @@ void OpenFiles(void)
} }
if (fileProp[0].slotSize == fileProp[1].slotSize) { if (fileProp[0].slotSize == fileProp[1].slotSize) {
setSlotSize(fileProp[0].slotSize); setSlotSize(fileProp[0].slotSize);
if (fileProp[0].slotSize>0) {
setSlotDisplayMode(true);
}
} else { } else {
printf("Error The 2 files has not the same header slotSize properties header ... \n"); printf("Error The 2 files has not the same header slotSize properties header ... \n");
} }
@ -227,10 +230,16 @@ void OpenFiles(void)
setTypeSize(fileProp[0].typeSize); setTypeSize(fileProp[0].typeSize);
setType(fileProp[0].type); setType(fileProp[0].type);
setSlotSize(fileProp[0].slotSize); setSlotSize(fileProp[0].slotSize);
if (fileProp[0].slotSize>0) {
setSlotDisplayMode(true);
}
} else if (fileProp[1].fileBasicOffset!=0) { } else if (fileProp[1].fileBasicOffset!=0) {
setTypeSize(fileProp[1].typeSize); setTypeSize(fileProp[1].typeSize);
setType(fileProp[1].type); setType(fileProp[1].type);
setSlotSize(fileProp[1].slotSize); setSlotSize(fileProp[1].slotSize);
if (fileProp[1].slotSize>0) {
setSlotDisplayMode(true);
}
} }
int32_t sizeElement=1; int32_t sizeElement=1;
showTypeSize_te tmpType = getTypeSize(); showTypeSize_te tmpType = getTypeSize();
@ -317,9 +326,9 @@ int main (int argc, char**argv)
} }
int32_t idError = findFirstDiff(); int32_t idError = findFirstDiff();
int minSizeFile = (fileProp[0].size<fileProp[1].size)?fileProp[0].size:fileProp[1].size; int minSizeFile = ((fileProp[0].size<fileProp[1].size)?fileProp[0].size:fileProp[1].size) - abs(getPaddingOffsetFile());
if (minSizeFile<=idError) { if (minSizeFile<=idError) {
printf(" No error ... file size=%d Bytes slot=%3d", idError, (int32_t)dividor); printf(" --- slot=%3d nb frame=%d", (int32_t)dividor, (int32_t)(idError/dividor));
CloseFiles(); CloseFiles();
// 0 : no error // 0 : no error
return 0; return 0;