From 2fd9621499bf0204c0ec541a26b74abf0589fcb5 Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Mon, 31 Jan 2011 21:22:39 +0000
Subject: [PATCH] Minor adjustments Cosmetics

---
 lib/request/inject.py | 22 +++++++++++-----------
 sqlmap.py             |  1 -
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/request/inject.py b/lib/request/inject.py
index ff4fd1eb7..ca6c04620 100644
--- a/lib/request/inject.py
+++ b/lib/request/inject.py
@@ -348,18 +348,18 @@ def __goError(expression, expected=None, resumeValue=True, dump=False):
     SQL injection vulnerability on the affected parameter.
     """
 
-    result = None
-
-    if conf.direct:
-        return direct(expression), None
+    output = None
 
     if resumeValue:
-        result = resume(expression, None)
+        output = resume(expression, None)
 
-    if not result:
-        result = errorUse(expression, expected, resumeValue, dump)
+        if output and expected == EXPECTED.INT and not output.isdigit():
+            output = None
 
-    return result
+    if output is None:
+        output = errorUse(expression, expected, resumeValue, dump)
+
+    return output
 
 def __goInband(expression, expected=None, sort=True, resumeValue=True, unpack=True, dump=False):
     """
@@ -374,10 +374,10 @@ def __goInband(expression, expected=None, sort=True, resumeValue=True, unpack=Tr
     if resumeValue:
         output = resume(expression, None)
 
-        if not output or (expected == EXPECTED.INT and not output.isdigit()):
+        if not output or (output and (expected == EXPECTED.INT and not output.isdigit())):
             partial = True
 
-    if not output:
+    if output is None:
         output = unionUse(expression, resetCounter=True, unpack=unpack, dump=dump)
 
     if output:
@@ -490,7 +490,7 @@ def goStacked(expression, silent=False):
     expression = cleanQuery(expression)
 
     if conf.direct:
-        return direct(expression), None
+        return direct(expression)
 
     comment = queries[Backend.getIdentifiedDbms()].comment.query
     query = agent.prefixQuery("; %s" % expression)
diff --git a/sqlmap.py b/sqlmap.py
index 748e8f8ef..be57524ee 100755
--- a/sqlmap.py
+++ b/sqlmap.py
@@ -63,7 +63,6 @@ def main():
 
     paths.SQLMAP_ROOT_PATH = modulePath()
     setPaths()
-
     banner()
 
     # Store original command line options for possible later restoration