mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify compress_reader and uncompress_reader

Browse Source 
They are the same code anyway
This commit is contained in:
Markus Goetz 2012-12-07 12:40:05 +01:00 committed by Klaas Freitag
parent d3585db4ba
commit 7ee75f5499
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/csync_owncloud.c
View File

@ -1278,32 +1278,16 @@ static ssize_t owncloud_write(csync_vio_method_handle_t *fhandle, const void *bu
return 0;
}
static int uncompress_reader(void *userdata, const char *buf, size_t len)
static int content_reader(void *userdata, const char *buf, size_t len)
{
struct transfer_context *writeCtx = userdata;
size_t written = 0;
if( buf && writeCtx->fd ) {
/* DEBUG_WEBDAV("Writing NON compressed %d bytes", len); */
/* DEBUG_WEBDAV("Writing %scompressed %d bytes", (writeCtx->decompress ? "" : "NON "), len); */
written = write(writeCtx->fd, buf, len);
if( len != written ) {
DEBUG_WEBDAV("WRN: uncompress_reader wrote wrong num of bytes");
}
return NE_OK;
}
return NE_ERROR;
}
static int compress_reader(void *userdata, const char *buf, size_t len)
{
struct transfer_context *writeCtx = userdata;
size_t written = 0;
if( buf && writeCtx->fd ) {
/* DEBUG_WEBDAV("Writing compressed %d bytes", len); */
written = write(writeCtx->fd, buf, len);
if( written != len ) {
DEBUG_WEBDAV("WRN: compress reader wrote wrong len");
DEBUG_WEBDAV("WRN: content_reader wrote wrong num of bytes");
}
return NE_OK;
}
@ -1336,11 +1320,11 @@ static void install_content_reader( ne_request *req, void *userdata, const ne_st
if( enc && c_streq( enc, "gzip" )) {
writeCtx->decompress = ne_decompress_reader( req, ne_accept_2xx,
compress_reader, /* reader callback */
content_reader, /* reader callback */
(void*) writeCtx ); /* userdata */
} else {
ne_add_response_body_reader( req, ne_accept_2xx,
uncompress_reader,
content_reader,
(void*) writeCtx );
writeCtx->decompress = NULL;
}