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
Oops forgot this
[idzebra-moved-to-github.git]
/
rset
/
rsnull.c
diff --git
a/rset/rsnull.c
b/rset/rsnull.c
index
f3d2135
..
ef0c49b
100644
(file)
--- a/
rset/rsnull.c
+++ b/
rset/rsnull.c
@@
-1,6
+1,6
@@
-/* $Id: rsnull.c,v 1.29 2004-10-22 10:12:52 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: rsnull.c,v 1.33 2005-04-26 10:09:38 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.
@@
-24,7
+24,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdio.h>
#include <assert.h>
#include <stdio.h>
#include <assert.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
#include <rset.h>
#include <rset.h>
@@
-48,8
+48,6
@@
static const struct rset_control control =
r_write,
};
r_write,
};
-const struct rset_control *rset_kind_null = &control;
-
RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol )
{
RSET rnew=rset_create_base(&control, nmem, kcontrol,0,0);
RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol )
{
RSET rnew=rset_create_base(&control, nmem, kcontrol,0,0);
@@
-62,7
+60,7
@@
static RSFD r_open (RSET ct, int flag)
RSFD rfd;
if (flag & RSETF_WRITE)
{
RSFD rfd;
if (flag & RSETF_WRITE)
{
- logf (LOG_FATAL, "NULL set type is read-only");
+ yaz_log (YLOG_FATAL, "NULL set type is read-only");
return NULL;
}
rfd=rfd_create_base(ct);
return NULL;
}
rfd=rfd_create_base(ct);
@@
-98,7
+96,7
@@
static int r_read (RSFD rfd, void *buf, TERMID *term)
static int r_write (RSFD rfd, const void *buf)
{
static int r_write (RSFD rfd, const void *buf)
{
- logf (LOG_FATAL, "NULL set type is read-only");
+ yaz_log (YLOG_FATAL, "NULL set type is read-only");
return -1;
}
return -1;
}