From 6133ab6055f68a11380d384c1d871774139035ea Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Thu, 12 Nov 2009 20:44:37 +0100
Subject: s3: Tiny logic simplification

---
 source3/libsmb/cliprint.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/source3/libsmb/cliprint.c b/source3/libsmb/cliprint.c
index e78930c1d5..723ae02623 100644
--- a/source3/libsmb/cliprint.c
+++ b/source3/libsmb/cliprint.c
@@ -27,20 +27,21 @@
 static const char *fix_char_ptr(unsigned int datap, unsigned int converter,
 			  char *rdata, int rdrcnt)
 {
+	unsigned int offset;
+
 	if (datap == 0)	{
 		/* turn NULL pointers into zero length strings */
 		return "";
-	} else {
-		unsigned int offset = datap - converter;
-
-		if (offset >= rdrcnt) {
-			DEBUG(1,("bad char ptr: datap=%u, converter=%u rdrcnt=%d>",
-				 datap, converter, rdrcnt));
-			return "<ERROR>";
-		} else {
-			return &rdata[offset];
-		}
 	}
+
+	offset = datap - converter;
+
+	if (offset >= rdrcnt) {
+		DEBUG(1,("bad char ptr: datap=%u, converter=%u rdrcnt=%d>",
+			 datap, converter, rdrcnt));
+		return "<ERROR>";
+	}
+	return &rdata[offset];
 }
 
 /****************************************************************************
-- 
cgit