yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Whitespace and indention cleanups to the HTTP download code.

Browse source
This commit is contained in:
Yamagi Burmeister 2018-12-10 19:22:09 +01:00
parent 0ad406a95f
commit cd1b67e489
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/client/cl_http.c
View file

@ -72,7 +72,7 @@ static size_t CL_HTTP_Recv(void *ptr, size_t size, size_t nmemb, void *stream)
// Since this is used for paclists only we assume that the // Since this is used for paclists only we assume that the
// file cannot be longer then 256k. Everythings else is // file cannot be longer then 256k. Everythings else is
// considered malicious or a broken server. // considered malicious or a broken server.
if (length < 1 || length > 262144) if (length < 1 || length > 262144)
{ {
length = 262144.0f; length = 262144.0f;
} }
@ -153,7 +153,7 @@ static void CL_StartHTTPDownload (dlqueue_t *entry, dlhandle_t *dl)
{ {
char tempFile[MAX_OSPATH]; char tempFile[MAX_OSPATH];
char escapedFilePath[MAX_QPATH*4]; char escapedFilePath[MAX_QPATH*4];
size_t len = strlen(entry->quakePath); size_t len = strlen(entry->quakePath);
if (len > 9 && !strncmp(entry->quakePath + len - 9, ".filelist", len)) if (len > 9 && !strncmp(entry->quakePath + len - 9, ".filelist", len))
@ -328,16 +328,16 @@ static void CL_CheckAndQueueDownload(char *path)
// Make sure that there're no evil pathes in the filelist. Most // Make sure that there're no evil pathes in the filelist. Most
// of these should be pretty okay with YQ2 since we've got a much // of these should be pretty okay with YQ2 since we've got a much
// better filesystem as other clients but let's stay consistent. // better filesystem as other clients but let's stay consistent.
// //
// .. -> Don't change to upper dirs. // .. -> Don't change to upper dirs.
// // -> Should be okay // // -> Should be okay
// \\ -> May fuck some string functions and CURL up. They // \\ -> May fuck some string functions and CURL up. They
// aren't valid URL characters anyways. // aren't valid URL characters anyways.
// //
// !pak && !strchr (path, '/') -> Plain files are always loaded // !pak && !strchr (path, '/') -> Plain files are always loaded
// from and into subdirs. // from and into subdirs.
// (pak && strchr(path, '/') -> Paks are always loaded from and // (pak && strchr(path, '/') -> Paks are always loaded from and
// into the toplevel dir. // into the toplevel dir.
if (strstr (path, "..") || strstr(path, "//") || strchr (path, '\\') || if (strstr (path, "..") || strstr(path, "//") || strchr (path, '\\') ||
(!pak && !strchr(path, '/')) || (pak && strchr(path, '/'))) (!pak && !strchr(path, '/')) || (pak && strchr(path, '/')))
{ {
@ -509,7 +509,7 @@ static void CL_FinishHTTPDownload(void)
// Some files aren't saved but read // Some files aren't saved but read
// into memory buffers. This is used // into memory buffers. This is used
// for filelists only. // for filelists only.
if (dl->file) if (dl->file)
{ {
isFile = true; isFile = true;
@ -542,7 +542,7 @@ static void CL_FinishHTTPDownload(void)
cls.downloadname[0] = 0; cls.downloadname[0] = 0;
cls.downloadposition = 0; cls.downloadposition = 0;
// Get the download result (success, some // Get the download result (success, some
// error, etc.) from CURL and process it. // error, etc.) from CURL and process it.
CURLcode result = msg->data.result; CURLcode result = msg->data.result;
long responseCode = 0; long responseCode = 0;
@ -596,7 +596,7 @@ static void CL_FinishHTTPDownload(void)
remove (dl->filePath); remove (dl->filePath);
} }
// ...and the handle from CURLs mutihandle. // ...and the handle from CURLs mutihandle.
curl_multi_remove_handle (multi, dl->curl); curl_multi_remove_handle (multi, dl->curl);
// Special case: We're already aborting HTTP downloading, // Special case: We're already aborting HTTP downloading,
@ -607,7 +607,7 @@ static void CL_FinishHTTPDownload(void)
continue; continue;
} }
// Abort all HTTP downloads. // Abort all HTTP downloads.
CL_CancelHTTPDownloads (true); CL_CancelHTTPDownloads (true);
continue; continue;
@ -624,7 +624,7 @@ static void CL_FinishHTTPDownload(void)
remove (dl->filePath); remove (dl->filePath);
} }
// ...and the handle from CURLs mutihandle. // ...and the handle from CURLs mutihandle.
curl_multi_remove_handle (multi, dl->curl); curl_multi_remove_handle (multi, dl->curl);
continue; continue;
@ -680,7 +680,7 @@ static void CL_FinishHTTPDownload(void)
CL_RequestNextDownload(); CL_RequestNextDownload();
} }
} }
/* /*
* Returns a free download handle. * Returns a free download handle.
*/ */
@ -894,7 +894,7 @@ qboolean CL_QueueHTTPDownload(const char *quakePath)
return false; return false;
} }
// Mkay, now that the first download is queued we want // Mkay, now that the first download is queued we want
// the generic(!) filelist. // the generic(!) filelist.
qboolean needList = false; qboolean needList = false;
@ -1017,5 +1017,5 @@ void CL_RunHTTPDownloads(void)
CL_StartNextHTTPDownload(); CL_StartNextHTTPDownload();
} }
} }
#endif /* USE_CURL */ #endif /* USE_CURL */