X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffb-file.c;h=04f2f4cf444442141fcfb3b4e74d5e852a9f1a99;hb=35257848f97710b8107e20f690404cfaf0838f74;hp=bd0f4d1ef41800fd9a6b06210c79e94f3811d090;hpb=eea73ef26a06a3b1e4508fa305a0dcaaf03df457;p=libucw.git diff --git a/lib/fb-file.c b/lib/fb-file.c index bd0f4d1e..04f2f4cf 100644 --- a/lib/fb-file.c +++ b/lib/fb-file.c @@ -57,9 +57,6 @@ bfd_spout(struct fastbuf *f) static int bfd_seek(struct fastbuf *f, sh_off_t pos, int whence) { - if (whence == SEEK_SET && pos == f->pos) - return 1; - sh_off_t l = sh_seek(FB_FILE(f)->fd, pos, whence); if (l < 0) return 0; @@ -74,7 +71,7 @@ bfd_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(FB_FILE(f)->fd); } @@ -95,7 +92,7 @@ bfd_config(struct fastbuf *f, uns item, int value) } static struct fastbuf * -bfdopen_internal(int fd, uns buflen, byte *name) +bfdopen_internal(int fd, uns buflen, const char *name) { int namelen = strlen(name) + 1; struct fb_file *F = xmalloc(sizeof(struct fb_file) + buflen + namelen); @@ -118,7 +115,7 @@ bfdopen_internal(int fd, uns buflen, byte *name) } struct fastbuf * -bopen_try(byte *name, uns mode, uns buflen) +bopen_try(const char *name, uns mode, uns buflen) { int fd = sh_open(name, mode, 0666); if (fd < 0) @@ -130,7 +127,7 @@ bopen_try(byte *name, uns mode, uns buflen) } struct fastbuf * -bopen(byte *name, uns mode, uns buflen) +bopen(const char *name, uns mode, uns buflen) { if (!buflen) return bopen_mm(name, mode); @@ -163,7 +160,7 @@ bfilesync(struct fastbuf *b) { bflush(b); if (fsync(FB_FILE(b)->fd) < 0) - log(L_ERROR, "fsync(%s) failed: %m", b->name); + msg(L_ERROR, "fsync(%s) failed: %m", b->name); } #ifdef TEST