Skip to content

Commit 1c86766

Browse files
committed
Small update
1 parent 8e4768d commit 1c86766

1 file changed

Lines changed: 5 additions & 30 deletions

File tree

pyneofile/pyneofile.py

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4746,12 +4746,7 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, contentasfile=False
47464746
return False
47474747
if(formdel != formatspecs['format_delimiter']):
47484748
return False
4749-
if(__use_new_style__):
4750-
inheader = ReadFileHeaderDataBySize(
4751-
fp, formatspecs['format_delimiter'])
4752-
else:
4753-
inheader = ReadFileHeaderDataWoSize(
4754-
fp, formatspecs['format_delimiter'])
4749+
inheader = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
47554750
fprechecksumtype = inheader[-2]
47564751
fprechecksum = inheader[-1]
47574752
headercheck = ValidateHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, fprechecksum, formatspecs, saltkey)
@@ -4814,12 +4809,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
48144809
return False
48154810
if(formdel != formatspecs['format_delimiter']):
48164811
return False
4817-
if(__use_new_style__):
4818-
inheader = ReadFileHeaderDataBySize(
4819-
fp, formatspecs['format_delimiter'])
4820-
else:
4821-
inheader = ReadFileHeaderDataWoSize(
4822-
fp, formatspecs['format_delimiter'])
4812+
inheader = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
48234813
fnumextrafieldsize = int(inheader[15], 16)
48244814
fnumextrafields = int(inheader[16], 16)
48254815
fextrafieldslist = []
@@ -4976,12 +4966,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
49764966
il = 0
49774967
while(il < seekstart):
49784968
prefhstart = fp.tell()
4979-
if(__use_new_style__):
4980-
preheaderdata = ReadFileHeaderDataBySize(
4981-
fp, formatspecs['format_delimiter'])
4982-
else:
4983-
preheaderdata = ReadFileHeaderDataWoSize(
4984-
fp, formatspecs['format_delimiter'])
4969+
preheaderdata = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
49854970
if(len(preheaderdata) == 0):
49864971
break
49874972
prefsize = int(preheaderdata[5], 16)
@@ -5074,12 +5059,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
50745059
return False
50755060
if(formdel != formatspecs['format_delimiter']):
50765061
return False
5077-
if(__use_new_style__):
5078-
inheader = ReadFileHeaderDataBySize(
5079-
fp, formatspecs['format_delimiter'])
5080-
else:
5081-
inheader = ReadFileHeaderDataWoSize(
5082-
fp, formatspecs['format_delimiter'])
5062+
inheader = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
50835063
fnumextrafieldsize = int(inheader[15], 16)
50845064
fnumextrafields = int(inheader[16], 16)
50855065
fextrafieldslist = []
@@ -5235,12 +5215,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
52355215
il = 0
52365216
while(il < seekstart):
52375217
prefhstart = fp.tell()
5238-
if(__use_new_style__):
5239-
preheaderdata = ReadFileHeaderDataBySize(
5240-
fp, formatspecs['format_delimiter'])
5241-
else:
5242-
preheaderdata = ReadFileHeaderDataWoSize(
5243-
fp, formatspecs['format_delimiter'])
5218+
preheaderdata = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
52445219
if(len(preheaderdata) == 0):
52455220
break
52465221
prefsize = int(preheaderdata[5], 16)

0 commit comments

Comments
 (0)