Netlib_GetHeader() - handful utility to avoid writing cycles

3 files changed, 12 insertions, 19 deletions

diff --git a/protocols/Discord/src/avatars.cpp b/protocols/Discord/src/avatars.cpp
index c0a5129b8b..d11409dae1 100644
--- a/protocols/Discord/src/avatars.cpp
+++ b/protocols/Discord/src/avatars.cpp
@@ -69,11 +69,8 @@ LBL_Error:
 		return;
 	}
 
-	for (int i = 0; i < reply->headersCount; i++)
-		if (!mir_strcmp(reply->headers[i].szName, "Content-Type")) {
-			ai.format = ProtoGetAvatarFormatByMimeType(reply->headers[i].szValue);
-			break;
-		}
+	if (auto *pszHdr = Netlib_GetHeader(reply, "Content-Type"))
+		ai.format = ProtoGetAvatarFormatByMimeType(pszHdr);
 
 	if (ai.format == PA_FORMAT_UNKNOWN) {
 		debugLogA("unknown avatar mime type");
diff --git a/protocols/Discord/src/gateway.cpp b/protocols/Discord/src/gateway.cpp
index fae8eef7cc..6b5e320904 100644
--- a/protocols/Discord/src/gateway.cpp
+++ b/protocols/Discord/src/gateway.cpp
@@ -56,15 +56,13 @@ bool CDiscordProto::GatewayThreadWorker()
 	debugLogA("Gateway connection succeeded");
 	m_hGatewayConnection = pReply->nlc;
 
-	for (int i=0; i < pReply->headersCount; i++)
-		if (!mir_strcmp(pReply->headers[i].szName, "Set-Cookie")) {
-			m_szCookie = pReply->headers[i].szValue;
+	if (auto *pszHdr = Netlib_GetHeader(pReply, "Set-Cookie")) {
+		m_szCookie = pszHdr;
 			
-			int idx = m_szCookie.Find(';');
-			if (idx != -1)
-				m_szCookie.Truncate(idx);
-			break;
-		}
+		int idx = m_szCookie.Find(';');
+		if (idx != -1)
+			m_szCookie.Truncate(idx);
+	}
 	Netlib_FreeHttpRequest(pReply);
 
 	bool bExit = false;
diff --git a/protocols/Discord/src/server.cpp b/protocols/Discord/src/server.cpp
index 94f87be530..2ce92b2281 100644
--- a/protocols/Discord/src/server.cpp
+++ b/protocols/Discord/src/server.cpp
@@ -173,12 +173,10 @@ void CDiscordProto::OnReceiveMyInfo(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest*
 	m_wszEmail = root["email"].as_mstring();
 
 	m_ownId = id;
-	for (int i = 0; i < pReply->headersCount; i++) {
-		if (!strcmp(pReply->headers[i].szName, "Set-Cookie")) {
-			char *p = strchr(pReply->headers[i].szValue, ';');
-			if (p) *p = 0;
-			m_szAccessCookie = mir_strdup(pReply->headers[i].szValue);
-		}
+	if (auto *pszHdr = Netlib_GetHeader(pReply, "Set-Cookie")) {
+		char *p = strchr(pszHdr, ';');
+		if (p) *p = 0;
+		m_szAccessCookie = mir_strdup(pszHdr);
 	}
 
 	OnLoggedIn();