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
Deal with double unlocks (which does happen sometimes)
[idzebra-moved-to-github.git]
/
rset
/
rstemp.c
diff --git
a/rset/rstemp.c
b/rset/rstemp.c
index
c4b1b03
..
aa886be
100644
(file)
--- a/
rset/rstemp.c
+++ b/
rset/rstemp.c
@@
-1,5
+1,5
@@
-/* $Id: rstemp.c,v 1.63 2005-05-03 09:11:36 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: rstemp.c,v 1.67 2006-06-06 21:01:31 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
Index Data ApS
This file is part of the Zebra server.
@@
-27,7
+27,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#ifdef WIN32
#include <io.h>
#include <string.h>
#ifdef WIN32
#include <io.h>
-#else
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <sys/types.h>
#include <unistd.h>
#endif
#include <sys/types.h>
@@
-51,7
+52,7
@@
static const struct rset_control control =
rset_get_one_term,
r_open,
r_close,
rset_get_one_term,
r_open,
r_close,
- rset_default_forward,
+ 0, /* no forward */
r_pos,
r_read,
r_write,
r_pos,
r_read,
r_write,
@@
-80,10
+81,11
@@
struct rfd_private {
static int log_level = 0;
static int log_level_initialized = 0;
static int log_level = 0;
static int log_level_initialized = 0;
-RSET rstemp_create(NMEM nmem, struct rset_key_control *kcontrol,
- int scope, const char *temp_path, TERMID term)
+RSET rset_create_temp(NMEM nmem, struct rset_key_control *kcontrol,
+ int scope, const char *temp_path, TERMID term)
{
{
- RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term);
+ RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term,
+ 0, 0);
struct rset_private *info;
if (!log_level_initialized)
{
struct rset_private *info;
if (!log_level_initialized)
{
@@
-230,7
+232,6
@@
static void r_close(RSFD rfd)
info->fd = -1;
}
}
info->fd = -1;
}
}
- rfd_delete_base(rfd);
}
}
@@
-332,3
+333,11
@@
static void r_pos(RSFD rfd, double *current, double *total)
*current = (double) mrfd->cur;
*total = (double) info->hits;
}
*current = (double) mrfd->cur;
*total = (double) info->hits;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+