From 3684e4d39270fab963dd4eb9b53c17e1d1a2cb4e Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Tue, 2 Aug 2011 19:52:25 +0000
Subject: [PATCH] [TCPIP] - Remove some more debugging [IP] - Only print a
 message if the operation failed

svn path=/branches/GSoC_2011/TcpIpDriver/; revision=53034
---
 drivers/network/tcpip/tcpip/main.c | 6 ------
 lib/drivers/ip/transport/tcp/tcp.c | 8 ++++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/network/tcpip/tcpip/main.c b/drivers/network/tcpip/tcpip/main.c
index 3fb9c8d9b4c..ad08ac729cd 100644
--- a/drivers/network/tcpip/tcpip/main.c
+++ b/drivers/network/tcpip/tcpip/main.c
@@ -282,8 +282,6 @@ NTSTATUS TiCloseFileObject(
     TDI_REQUEST Request;
     NTSTATUS Status;
 
-    DbgPrint("[TCPIP, TiCloseFileObject] Called\n");
-
     IrpSp   = IoGetCurrentIrpStackLocation(Irp);
     Context = IrpSp->FileObject->FsContext;
     if (!Context)
@@ -295,7 +293,6 @@ NTSTATUS TiCloseFileObject(
     switch ((ULONG_PTR)IrpSp->FileObject->FsContext2)
     {
         case TDI_TRANSPORT_ADDRESS_FILE:
-            DbgPrint("[TCPIP, TiCloseFileObject] Closing address file\n");
             Request.Handle.AddressHandle = Context->Handle.AddressHandle;
             Status = FileCloseAddress(&Request);
             break;
@@ -311,15 +308,12 @@ NTSTATUS TiCloseFileObject(
             break;
 
         default:
-            DbgPrint("Unknown type %d\n", (ULONG_PTR)IrpSp->FileObject->FsContext2);
             Status = STATUS_INVALID_PARAMETER;
             break;
     }
 
     Irp->IoStatus.Status = Status;
 
-    DbgPrint("[TCPIP, TiCloseFileObject] Leaving. Status = 0x%x\n", Status);
-
     return Irp->IoStatus.Status;
 }
 
diff --git a/lib/drivers/ip/transport/tcp/tcp.c b/lib/drivers/ip/transport/tcp/tcp.c
index cf3fb98b2ea..340c13761da 100644
--- a/lib/drivers/ip/transport/tcp/tcp.c
+++ b/lib/drivers/ip/transport/tcp/tcp.c
@@ -195,7 +195,7 @@ NTSTATUS TCPTranslateError(const err_t err)
 
     switch (err)
     {
-        case ERR_OK: Status = STATUS_SUCCESS; break; //0
+        case ERR_OK: Status = STATUS_SUCCESS; return Status; //0
         case ERR_MEM: Status = STATUS_INSUFFICIENT_RESOURCES; break; //-1
         case ERR_BUF: Status = STATUS_BUFFER_TOO_SMALL; break; //-2
         case ERR_TIMEOUT: Status = STATUS_TIMEOUT; break; // -3
@@ -209,7 +209,7 @@ NTSTATUS TCPTranslateError(const err_t err)
         case ERR_USE: Status = STATUS_ADDRESS_ALREADY_EXISTS; break; //-11
         case ERR_IF: Status = STATUS_NETWORK_UNREACHABLE; break; //-12
         case ERR_ISCONN: Status = STATUS_UNSUCCESSFUL; break; //-13 (FIXME)
-        case ERR_INPROGRESS: Status = STATUS_PENDING; break; //-14
+        case ERR_INPROGRESS: Status = STATUS_PENDING; return Status; //-14
         default:
             DbgPrint("Invalid error value: %d\n", err);
             ASSERT(FALSE);
@@ -217,8 +217,8 @@ NTSTATUS TCPTranslateError(const err_t err)
             break;
     }
     
-    DbgPrint("TCPTranslateError: %d -> %x\n", (unsigned int)err, Status);
-    
+    DbgPrint("TCP operation failed: 0x%x (%d)\n", Status, err);
+
     return Status;
 }