From 4d98c72902a36bf0c1039d156d73b2e2f4c07210 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 26 Nov 2004 20:45:26 +0000 Subject: [PATCH] m_iResponceName -> m_sResponseName CString::find and CString::Find are not interchangeable; Find() is only for compatibility, prefer find() --- stepmania/src/ScreenPackages.cpp | 10 +++++----- stepmania/src/ScreenPackages.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenPackages.cpp b/stepmania/src/ScreenPackages.cpp index b12c446785..c6f77f3e6b 100644 --- a/stepmania/src/ScreenPackages.cpp +++ b/stepmania/src/ScreenPackages.cpp @@ -602,14 +602,14 @@ void ScreenPackages::HTTPUpdate() { int i = m_sBUFFER.find(" "); int j = m_sBUFFER.find(" ",i+1); - int k = m_sBUFFER.Find("\n",j+1); - if ( i < 0 || j < 0 || k < 0 ) + int k = m_sBUFFER.find("\n",j+1); + if ( i == string::npos || j == string::npos || k == string::npos ) { m_iResponseCode = -100; - m_iResponceName = "Malformed response."; + m_sResponseName = "Malformed response."; } m_iResponseCode = atoi(m_sBUFFER.substr(i+1,j-i).c_str()); - m_iResponceName = m_sBUFFER.substr( j+1, k-j).c_str(); + m_sResponseName = m_sBUFFER.substr( j+1, k-j).c_str(); i = m_sBUFFER.find("Content-Length:"); j = m_sBUFFER.find("\n", i+1 ); @@ -651,7 +651,7 @@ void ScreenPackages::HTTPUpdate() if( m_iResponseCode < 200 || m_iResponseCode >= 400 ) { - m_sStatus = ssprintf( "%d", m_iResponseCode ) + m_iResponceName; + m_sStatus = ssprintf( "%d", m_iResponseCode ) + m_sResponseName; } else { diff --git a/stepmania/src/ScreenPackages.h b/stepmania/src/ScreenPackages.h index caff8c3823..2ae0fef334 100644 --- a/stepmania/src/ScreenPackages.h +++ b/stepmania/src/ScreenPackages.h @@ -89,7 +89,7 @@ private: long m_iDownloaded; long m_iResponseCode; - CString m_iResponceName; + CString m_sResponseName; //Raw HTTP Buffer CString m_sBUFFER;