From 6406b75b8fb1e1a15dde10534c1fe3aa235e9903 Mon Sep 17 00:00:00 2001
From: yexo <yexo@openttd.org>
Date: Thu, 11 Feb 2010 14:58:51 +0000
Subject: [PATCH] (svn r19094) -Codechange: don't check for NULL values before
 calling StrEmpty

---
 src/blitter/factory.hpp     | 2 +-
 src/network/network_udp.cpp | 5 ++---
 src/newgrf_gui.cpp          | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/blitter/factory.hpp b/src/blitter/factory.hpp
index 8c0539ce15..cdacdac2f9 100644
--- a/src/blitter/factory.hpp
+++ b/src/blitter/factory.hpp
@@ -106,7 +106,7 @@ public:
 				delete *GetActiveBlitter();
 				*GetActiveBlitter() = newb;
 
-				DEBUG(driver, 1, "Successfully %s blitter '%s'",StrEmpty(name) ? "probed" : "loaded", bname);
+				DEBUG(driver, 1, "Successfully %s blitter '%s'", StrEmpty(name) ? "probed" : "loaded", bname);
 				return newb;
 			}
 		}
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp
index 817fb40d68..2197da8d4d 100644
--- a/src/network/network_udp.cpp
+++ b/src/network/network_udp.cpp
@@ -190,7 +190,7 @@ DEF_UDP_RECEIVE_COMMAND(Server, PACKET_UDP_CLIENT_GET_NEWGRFS)
 		 * the current list and do not send the other data.
 		 * The name could be an empty string, if so take the filename. */
 		packet_len += sizeof(c.grfid) + sizeof(c.md5sum) +
-				min(strlen((f->name != NULL && !StrEmpty(f->name)) ? f->name : f->filename) + 1, (size_t)NETWORK_GRF_NAME_LENGTH);
+				min(strlen((!StrEmpty(f->name)) ? f->name : f->filename) + 1, (size_t)NETWORK_GRF_NAME_LENGTH);
 		if (packet_len > SEND_MTU - 4) { // 4 is 3 byte header + grf count in reply
 			break;
 		}
@@ -206,8 +206,7 @@ DEF_UDP_RECEIVE_COMMAND(Server, PACKET_UDP_CLIENT_GET_NEWGRFS)
 		char name[NETWORK_GRF_NAME_LENGTH];
 
 		/* The name could be an empty string, if so take the filename */
-		strecpy(name, (in_reply[i]->name != NULL && !StrEmpty(in_reply[i]->name)) ?
-				in_reply[i]->name : in_reply[i]->filename, lastof(name));
+		strecpy(name, (!StrEmpty(in_reply[i]->name)) ? in_reply[i]->name : in_reply[i]->filename, lastof(name));
 		this->Send_GRFIdentifier(&packet, in_reply[i]);
 		packet.Send_string(name);
 	}
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 8f32e7bcfb..f88bdcd893 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -131,7 +131,7 @@ static void ShowNewGRFInfo(const GRFConfig *c, uint x, uint y, uint right, uint
 	if (HasBit(c->flags, GCF_COMPATIBLE)) y = DrawStringMultiLine(x, right, y, bottom, STR_NEWGRF_COMPATIBLE_LOADED);
 
 	/* Draw GRF info if it exists */
-	if (c->info != NULL && !StrEmpty(c->info)) {
+	if (!StrEmpty(c->info)) {
 		SetDParam(0, STR_JUST_RAW_STRING);
 		SetDParamStr(1, c->info);
 		y = DrawStringMultiLine(x, right, y, bottom, STR_BLACK_STRING);
@@ -326,7 +326,7 @@ public:
 				{
 					const GRFConfig *c = this->grfs[i];
 					bool h = c == this->sel;
-					const char *text = (c->name != NULL && !StrEmpty(c->name)) ? c->name : c->filename;
+					const char *text = (!StrEmpty(c->name)) ? c->name : c->filename;
 
 					/* Draw selection background */
 					if (h) GfxFillRect(r.left + 1, y, r.right - 1, y + this->resize.step_height - 1, 156);
@@ -657,7 +657,7 @@ struct NewGRFWindow : public Window {
 				int i = 0;
 				for (const GRFConfig *c = this->list; c != NULL; c = c->next, i++) {
 					if (this->vscroll.IsVisible(i)) {
-						const char *text = (c->name != NULL && !StrEmpty(c->name)) ? c->name : c->filename;
+						const char *text = (!StrEmpty(c->name)) ? c->name : c->filename;
 						PaletteID pal;
 
 						/* Pick a colour */