stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-17 23:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

I am dumb, SV_AbortSendFiles already does what SV_RemoveFileSendList was made to do

Browse source
This commit is contained in:
Monster Iestyn 2017-05-26 14:19:18 +01:00
parent 7979f84e25
commit 569af9f4c1
1 changed files with 1 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/d_netfil.c
View file

@ -64,7 +64,6 @@
// Prototypes // Prototypes
static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid); static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid);
static void SV_RemoveFileSendList(INT32 node);
// Sender structure // Sender structure
typedef struct filetx_s typedef struct filetx_s
@ -319,7 +318,7 @@ boolean Got_RequestFilePak(INT32 node)
READSTRINGN(p, wad, MAX_WADPATH); READSTRINGN(p, wad, MAX_WADPATH);
if (!SV_SendFile(node, wad, id)) if (!SV_SendFile(node, wad, id))
{ {
SV_RemoveFileSendList(node); SV_AbortSendFiles(node);
return false; // don't read the rest of the files return false; // don't read the rest of the files
} }
} }
@ -607,50 +606,6 @@ void SV_SendRam(INT32 node, void *data, size_t size, freemethod_t freemethod, UI
filestosend++; filestosend++;
} }
/** Removes all file requests for a node
* This is needed only if a PT_REQUESTFILE's content gave you something that shouldn't be there
*
* \param node The destination
* \sa Got_RequestFilePak
*
*/
static void SV_RemoveFileSendList(INT32 node)
{
filetx_t *p = transfer[node].txlist;
if (p == NULL)
return; // ...well, that was easy
while (p)
{
// Free the file request according to the freemethod parameter used with SV_SendFile/Ram
switch (p->ram)
{
case SF_FILE: // It's a file, close it and free its filename
if (cv_noticedownload.value)
CONS_Printf("Cancelling file transfer for node %d\n", node);
if (transfer[node].currentfile)
fclose(transfer[node].currentfile);
free(p->id.filename);
break;
case SF_Z_RAM: // It's a memory block allocated with Z_Alloc or the likes, use Z_Free
Z_Free(p->id.ram);
break;
case SF_RAM: // It's a memory block allocated with malloc, use free
free(p->id.ram);
case SF_NOFREERAM: // Nothing to free
break;
}
// Remove the file request from the list
transfer[node].txlist = p->next;
free(p);
p = transfer[node].txlist;
// Indicate that the transmission is over (if for some reason it had started)
transfer[node].currentfile = NULL;
filestosend--;
}
}
/** Stops sending a file for a node, and removes the file request from the list, /** Stops sending a file for a node, and removes the file request from the list,
* either because the file has been fully sent or because the node was disconnected * either because the file has been fully sent or because the node was disconnected
* *