Mercurial > hg > openttd
changeset 14444:548a0484831c draft
(svn r19001) -Fix: some GCC compile warnings
author | rubidium <rubidium@openttd.org> |
---|---|
date | Thu, 04 Feb 2010 13:35:20 +0000 |
parents | 0accf5b8ff60 |
children | 19d94a8ee95c |
files | src/network/core/tcp_http.h src/network/network_content.cpp |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/network/core/tcp_http.h +++ b/src/network/core/tcp_http.h @@ -33,6 +33,9 @@ * @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. */
--- a/src/network/network_content.cpp +++ b/src/network/network_content.cpp @@ -553,9 +553,9 @@ 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 @@ } p = strrchr(str, '/'); - check(p); + check_not_null(p); char tmp[MAX_PATH]; if (strecpy(tmp, p, lastof(tmp)) == lastof(tmp)) {