cpp/openttd-patchpack/source Changeset - r14434:ff88a5e07169

Changeset - r14434:ff88a5e07169

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 14 years ago 2010-02-04 13:35:20
rubidium@openttd.org

(svn r19001) -Fix: some GCC compile warnings

2 files changed with 6 insertions and 3 deletions:

src/network/core/tcp_http.h

src/network/network_content.cpp

0 comments (0 inline, 0 general)

src/network/core/tcp_http.h

➞

Show inline comments

@@ @@ -33,6 +33,9 @@ struct HTTPCallback { @@
 	 * @note When NULL is sent the HTTP socket handler is closed/freed.
 	 */
 	virtual void OnReceiveData(const char *data, size_t length) = 0;
 	/** Silentium */
 	virtual ~HTTPCallback() {}
 };
 /** Base socket handler for HTTP traffic. */

src/network/network_content.cpp

➞

Show inline comments

@@ @@ -553,9 +553,9 @@ void ClientNetworkContentSocketHandler:: @@
 	this->curInfo = new ContentInfo;
 /** Check p for not being null and return calling OnFailure if that's not the case. */
-#define check(p) { if ((p) == NULL) { this->OnFailure(); return; } }
+#define check_not_null(p) { if ((p) == NULL) { this->OnFailure(); return; } }
 /** Check p for not being null and then terminate, or return calling OnFailure. */
-#define check_and_terminate(p) { check(p); *(p) = '\0'; }
+#define check_and_terminate(p) { check_not_null(p); *(p) = '\0'; }
 	for (;;) {
 		char *str = this->http_response.Begin() + this->http_response_index;
@@ @@ -595,7 +595,7 @@ void ClientNetworkContentSocketHandler:: @@
+		}
 		p = strrchr(str, '/');
-		check(p);
+		check_not_null(p);
 		char tmp[MAX_PATH];
 		if (strecpy(tmp, p, lastof(tmp)) == lastof(tmp)) {

0 comments (0 inline, 0 general)