Skip to content

Commit 06c4710

Browse files
committed
Small update
1 parent bd43bd5 commit 06c4710

1 file changed

Lines changed: 5 additions & 30 deletions

File tree

pyfoxfile/pyfoxfile.py

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4752,12 +4752,7 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, contentasfile=False
47524752
return False
47534753
if(formdel != formatspecs['format_delimiter']):
47544754
return False
4755-
if(__use_new_style__):
4756-
inheader = ReadFileHeaderDataBySize(
4757-
fp, formatspecs['format_delimiter'])
4758-
else:
4759-
inheader = ReadFileHeaderDataWoSize(
4760-
fp, formatspecs['format_delimiter'])
4755+
inheader = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
47614756
fprechecksumtype = inheader[-2]
47624757
fprechecksum = inheader[-1]
47634758
headercheck = ValidateHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, fprechecksum, formatspecs, saltkey)
@@ -4820,12 +4815,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
48204815
return False
48214816
if(formdel != formatspecs['format_delimiter']):
48224817
return False
4823-
if(__use_new_style__):
4824-
inheader = ReadFileHeaderDataBySize(
4825-
fp, formatspecs['format_delimiter'])
4826-
else:
4827-
inheader = ReadFileHeaderDataWoSize(
4828-
fp, formatspecs['format_delimiter'])
4818+
inheader = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
48294819
fnumextrafieldsize = int(inheader[15], 16)
48304820
fnumextrafields = int(inheader[16], 16)
48314821
fextrafieldslist = []
@@ -4982,12 +4972,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
49824972
il = 0
49834973
while(il < seekstart):
49844974
prefhstart = fp.tell()
4985-
if(__use_new_style__):
4986-
preheaderdata = ReadFileHeaderDataBySize(
4987-
fp, formatspecs['format_delimiter'])
4988-
else:
4989-
preheaderdata = ReadFileHeaderDataWoSize(
4990-
fp, formatspecs['format_delimiter'])
4975+
preheaderdata = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
49914976
if(len(preheaderdata) == 0):
49924977
break
49934978
prefsize = int(preheaderdata[5], 16)
@@ -5080,12 +5065,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
50805065
return False
50815066
if(formdel != formatspecs['format_delimiter']):
50825067
return False
5083-
if(__use_new_style__):
5084-
inheader = ReadFileHeaderDataBySize(
5085-
fp, formatspecs['format_delimiter'])
5086-
else:
5087-
inheader = ReadFileHeaderDataWoSize(
5088-
fp, formatspecs['format_delimiter'])
5068+
inheader = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
50895069
fnumextrafieldsize = int(inheader[15], 16)
50905070
fnumextrafields = int(inheader[16], 16)
50915071
fextrafieldslist = []
@@ -5241,12 +5221,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
52415221
il = 0
52425222
while(il < seekstart):
52435223
prefhstart = fp.tell()
5244-
if(__use_new_style__):
5245-
preheaderdata = ReadFileHeaderDataBySize(
5246-
fp, formatspecs['format_delimiter'])
5247-
else:
5248-
preheaderdata = ReadFileHeaderDataWoSize(
5249-
fp, formatspecs['format_delimiter'])
5224+
preheaderdata = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
52505225
if(len(preheaderdata) == 0):
52515226
break
52525227
prefsize = int(preheaderdata[5], 16)

0 commit comments

Comments
 (0)