s3: Tiny logic simplification

diff --git a/source3/libsmb/cliprint.c b/source3/libsmb/cliprint.c
index e78930c1d5bcd91088a5581715f8ff1655b26752..723ae02623e284a61d8d4beb5cad74ec422f5dc5 100644 (file)
--- 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];
 }
 
 /****************************************************************************