X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Ffb-direct.c;h=2fa6ec7f7e16e12037f6a98d017d3c48fcced9e3;hb=6647c67c43279443c3c34564ce102f43a95f00f0;hp=b82faa9157a05aabcdca4c373ba658316df5d629;hpb=c460be258f74353287bb852c37c7782a0322a3c0;p=libucw.git diff --git a/lib/fb-direct.c b/lib/fb-direct.c index b82faa91..2fa6ec7f 100644 --- a/lib/fb-direct.c +++ b/lib/fb-direct.c @@ -268,7 +268,7 @@ fbdir_close(struct fastbuf *f) { case 1: if (unlink(f->name) < 0) - log(L_ERROR, "unlink(%s): %m", f->name); + msg(L_ERROR, "unlink(%s): %m", f->name); case 0: close(F->fd); } @@ -279,18 +279,21 @@ fbdir_close(struct fastbuf *f) static int fbdir_config(struct fastbuf *f, uns item, int value) { + int orig; + switch (item) { case BCONFIG_IS_TEMP_FILE: + orig = FB_DIRECT(f)->is_temp_file; FB_DIRECT(f)->is_temp_file = value; - return 0; + return orig; default: return -1; } } struct fastbuf * -fbdir_open_fd_internal(int fd, byte *name, struct asio_queue *q, uns buffer_size, uns read_ahead UNUSED, uns write_back) +fbdir_open_fd_internal(int fd, const char *name, struct asio_queue *q, uns buffer_size, uns read_ahead UNUSED, uns write_back) { int namelen = strlen(name) + 1; struct fb_direct *F = xmalloc(sizeof(struct fb_direct) + namelen);