X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=libcurl.c;h=1c30808a5fd780ad4d57fd1c59ea138250b1871e;hp=616e8945ef8861bc2558f873879cb0bd1edc9e6d;hb=397530aecdd5492236e3dc5620ee7126078c07f3;hpb=6e9bda526592af7d22c76bad63703fd68f0839c8 diff --git a/libcurl.c b/libcurl.c index 616e8945..1c30808a 100644 --- a/libcurl.c +++ b/libcurl.c @@ -281,7 +281,7 @@ static void Curl_CheckCommandWhenDone() return; if(numdownloads_added && (numdownloads_success == numdownloads_added) && *command_when_done) { - Con_DPrintf("Map downloads occurred, executing %s\n", command_when_done); + Con_DPrintf("cURL downloads occurred, executing %s\n", command_when_done); Cbuf_AddText("\n"); Cbuf_AddText(command_when_done); Cbuf_AddText("\n"); @@ -289,7 +289,7 @@ static void Curl_CheckCommandWhenDone() } else if(numdownloads_added && numdownloads_fail && *command_when_error) { - Con_DPrintf("Map downloads FAILED, executing %s\n", command_when_error); + Con_DPrintf("cURL downloads FAILED, executing %s\n", command_when_error); Cbuf_AddText("\n"); Cbuf_AddText(command_when_error); Cbuf_AddText("\n"); @@ -642,7 +642,7 @@ void Curl_Begin(const char *URL, const char *name, qboolean ispak, qboolean fort return; } } - + if(ispak && FS_FileExists(fn)) { qboolean already_loaded; @@ -737,7 +737,7 @@ void Curl_Run() { int remaining; CURLMcode mc; - + do { mc = qcurl_multi_perform(curlm, &remaining); @@ -773,7 +773,7 @@ void Curl_Run() break; } } - + Curl_EndDownload(di, failed, result); } } @@ -1030,7 +1030,7 @@ void Curl_Curl_f(void) char donecommand[256]; if(cls.netcon) { - if(cls.loadbegun) // curling won't inhibit loading the map any more when at this stage, so bail out and force a reconnect + if(cl.loadbegun) // curling won't inhibit loading the map any more when at this stage, so bail out and force a reconnect { dpsnprintf(donecommand, sizeof(donecommand), "connect %s", cls.netcon->address); Curl_CommandWhenDone(donecommand); @@ -1120,7 +1120,7 @@ Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **addition } ++i; } - + if(additional_info) { // TODO: can I clear command_when_done as soon as the first download fails? @@ -1178,7 +1178,7 @@ static const char *Curl_FindPackURL(const char *filename) char *p = buf; char *pattern = NULL, *patternend = NULL, *url = NULL, *urlend = NULL; qboolean eof = false; - + pattern = p; while(!eof) {