X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=libcitadel%2Flib%2Fstringbuf.c;h=0d88f7ca14f9c2e9925b744300194791c3334f7f;hp=1d24342771ee10998ef1e251379474cde22d8e89;hb=339c9999dbd2afb4cbd14af8f4b49ea1b7838fa3;hpb=e6469e2a7767c324aab59170041f72dd95ee2152 diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c index 1d2434277..0d88f7ca1 100644 --- a/libcitadel/lib/stringbuf.c +++ b/libcitadel/lib/stringbuf.c @@ -3869,7 +3869,7 @@ void FDIOBufferInit(FDIOBuffer *FDB, IOBuffer *IO, int FD, long TotalSendSize) FDB->ChunkSize = FDB->TotalSendSize = TotalSendSize; FDB->IOB = IO; -#ifndef LINUX_SENDFILE +#ifndef LINUX_SPLICE FDB->ChunkBuffer = NewStrBufPlain(NULL, TotalSendSize + 1); #else pipe(FDB->SplicePipe); @@ -3879,7 +3879,7 @@ void FDIOBufferInit(FDIOBuffer *FDB, IOBuffer *IO, int FD, long TotalSendSize) void FDIOBufferDelete(FDIOBuffer *FDB) { -#ifndef LINUX_SENDFILE +#ifndef LINUX_SPLICE FreeStrBuf(&FDB->ChunkBuffer); #else close(FDB->SplicePipe[0]); @@ -3893,7 +3893,7 @@ void FDIOBufferDelete(FDIOBuffer *FDB) int FileSendChunked(FDIOBuffer *FDB, const char **Err) { -#ifdef LINUX_SENDFILE +#ifdef LINUX_SPLICE ssize_t sent; sent = sendfile(FDB->IOB->fd, FDB->OtherFD, &FDB->TotalSentAlready, FDB->ChunkSendRemain); if (sent == -1) @@ -3939,7 +3939,7 @@ int FileRecvChunked(FDIOBuffer *FDB, const char **Err) { ssize_t sent, pipesize; -#ifdef LINUX_SENDFILE +#ifdef LINUX_SPLICE pipesize = splice(FDB->IOB->fd, NULL, FDB->SplicePipe[1], NULL,