summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Albert <albertj@us.ibm.com>2015-03-02 12:09:55 -0600
committerJason Albert <albertj@us.ibm.com>2015-03-02 12:09:55 -0600
commita0af7ade0220c525a09bf688180a4ee53cc20d7c (patch)
treec378408f7da168f66b40192ee27a38fbb3a35867
parent0d136c7f161ed81c956008c3ab99fdbb6497052b (diff)
downloadvpdtools-a0af7ade0220c525a09bf688180a4ee53cc20d7c.tar.gz
vpdtools-a0af7ade0220c525a09bf688180a4ee53cc20d7c.zip
Cleaned up keyword length checks
-rwxr-xr-xcreateVpd.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/createVpd.py b/createVpd.py
index d800686..4beb3ee 100755
--- a/createVpd.py
+++ b/createVpd.py
@@ -237,12 +237,11 @@ for record in manifest.iter("record"):
# Check that the length specified isn't longer than the keyword supports
# Keywords that start with # are 2 bytes, others are 1 byte
if (keywordName[0] == "#"):
- if (kwlen >= 65535):
- error("The specified length %d is bigger than the max length 65535 for keyword %s in record %s" % (kwlen, keywordName, recordName))
- errorsFound+=1
+ maxlen = 65535
else:
- if (kwlen >= 255):
- error("The specified length %d is bigger than the max length 255 for keyword %s in record %s" % (kwlen, keywordName, recordName))
+ maxlen = 255
+ if (kwlen >= maxlen):
+ error("The specified length %d is bigger than the max length %d for keyword %s in record %s" % (kwlen, maxlen, keywordName, recordName))
errorsFound+=1
# --------
OpenPOWER on IntegriCloud