projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added more Doxygen comments
[idzebra-moved-to-github.git]
/
rset
/
rstemp.c
diff --git
a/rset/rstemp.c
b/rset/rstemp.c
index
984249b
..
8b110b6
100644
(file)
--- a/
rset/rstemp.c
+++ b/
rset/rstemp.c
@@
-1,6
+1,6
@@
-/* $Id: rstemp.c,v 1.54 2004-11-04 13:54:08 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
- Index Data Aps
+/* $Id: rstemp.c,v 1.57 2005-01-15 19:38:35 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-115,10
+115,10
@@
static void r_delete (RSET ct)
{
struct rset_temp_info *info = (struct rset_temp_info*) ct->priv;
{
struct rset_temp_info *info = (struct rset_temp_info*) ct->priv;
- logf (log_level, "r_delete: set size %ld", (long) info->pos_end);
+ yaz_log (log_level, "r_delete: set size %ld", (long) info->pos_end);
if (info->fname)
{
if (info->fname)
{
- logf (log_level, "r_delete: unlink %s", info->fname);
+ yaz_log (log_level, "r_delete: unlink %s", info->fname);
unlink (info->fname);
}
}
unlink (info->fname);
}
}
@@
-138,7
+138,7
@@
static RSFD r_open (RSET ct, int flag)
info->fd = open (info->fname, O_BINARY|O_RDONLY);
if (info->fd == -1)
{
info->fd = open (info->fname, O_BINARY|O_RDONLY);
if (info->fd == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "rstemp: open failed %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: open failed %s", info->fname);
exit (1);
}
}
exit (1);
}
}
@@
-167,8
+167,8
@@
static void r_flush (RSFD rfd, int mk)
if (!info->fname && mk)
{
if (!info->fname && mk)
{
-#if HAVE_MKSTEMP
char template[1024];
char template[1024];
+#if HAVE_MKSTEMP
if (info->temp_path)
sprintf (template, "%s/zrsXXXXXX", info->temp_path);
if (info->temp_path)
sprintf (template, "%s/zrsXXXXXX", info->temp_path);
@@
-179,7
+179,7
@@
static void r_flush (RSFD rfd, int mk)
if (info->fd == -1)
{
if (info->fd == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "rstemp: mkstemp %s", template);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: mkstemp %s", template);
exit (1);
}
info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
exit (1);
}
info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
@@
-189,11
+189,11
@@
static void r_flush (RSFD rfd, int mk)
info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
strcpy (info->fname, s);
info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
strcpy (info->fname, s);
- logf (log_level, "creating tempfile %s", info->fname);
+ yaz_log (log_level, "creating tempfile %s", info->fname);
info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666);
if (info->fd == -1)
{
info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666);
if (info->fd == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "rstemp: open %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: open %s", info->fname);
exit (1);
}
#endif
exit (1);
}
#endif
@@
-205,7
+205,7
@@
static void r_flush (RSFD rfd, int mk)
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "rstemp: lseek %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek %s", info->fname);
exit (1);
}
count = info->buf_size;
exit (1);
}
count = info->buf_size;
@@
-214,9
+214,9
@@
static void r_flush (RSFD rfd, int mk)
if ((r = write (info->fd, info->buf_mem, count)) < (int) count)
{
if (r == -1)
if ((r = write (info->fd, info->buf_mem, count)) < (int) count)
{
if (r == -1)
- logf (LOG_FATAL|LOG_ERRNO, "rstemp: write %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: write %s", info->fname);
else
else
- logf (LOG_FATAL, "rstemp: write of %ld but got %ld",
+ yaz_log (YLOG_FATAL, "rstemp: write of %ld but got %ld",
(long) count, (long) r);
exit (1);
}
(long) count, (long) r);
exit (1);
}
@@
-261,15
+261,15
@@
static void r_reread (RSFD rfd)
{
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
{
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "rstemp: lseek %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek %s", info->fname);
exit (1);
}
if ((r = read (info->fd, info->buf_mem, count)) < (int) count)
{
if (r == -1)
exit (1);
}
if ((r = read (info->fd, info->buf_mem, count)) < (int) count)
{
if (r == -1)
- logf (LOG_FATAL|LOG_ERRNO, "rstemp: read %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: read %s", info->fname);
else
else
- logf (LOG_FATAL, "read of %ld but got %ld",
+ yaz_log (YLOG_FATAL, "read of %ld but got %ld",
(long) count, (long) r);
exit (1);
}
(long) count, (long) r);
exit (1);
}