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
Get rid of typedefs iSAMS_P, ISAMC_P, ISAMB_P and use ISAM_P instead.
[idzebra-moved-to-github.git]
/
recctrl
/
xmlread.c
diff --git
a/recctrl/xmlread.c
b/recctrl/xmlread.c
index
52bb098
..
08c3e23
100644
(file)
--- a/
recctrl/xmlread.c
+++ b/
recctrl/xmlread.c
@@
-1,6
+1,6
@@
-/* $Id: xmlread.c,v 1.17 2004-12-13 20:51:32 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: xmlread.c,v 1.19 2005-03-31 12:42:07 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.
@@
-484,7
+484,7
@@
static data1_node *grs_read_xml (struct grs_read_info *p)
return zebra_read_xml (p->dh, p->readf, p->fh, p->mem);
}
return zebra_read_xml (p->dh, p->readf, p->fh, p->mem);
}
-static void *init_xml(Res res, RecType recType)
+static void *filter_init(Res res, RecType recType)
{
struct xml_info *p = (struct xml_info *) xmalloc (sizeof(*p));
{
struct xml_info *p = (struct xml_info *) xmalloc (sizeof(*p));
@@
-493,30
+493,31
@@
static void *init_xml(Res res, RecType recType)
return p;
}
return p;
}
-static void destroy_xml(void *clientData)
+static void filter_destroy(void *clientData)
{
struct xml_info *p = (struct xml_info *) clientData;
xfree (p);
}
{
struct xml_info *p = (struct xml_info *) clientData;
xfree (p);
}
-static int extract_xml(void *clientData, struct recExtractCtrl *ctrl)
+static int filter_extract(void *clientData, struct recExtractCtrl *ctrl)
{
return zebra_grs_extract(clientData, ctrl, grs_read_xml);
}
{
return zebra_grs_extract(clientData, ctrl, grs_read_xml);
}
-static int retrieve_xml(void *clientData, struct recRetrieveCtrl *ctrl)
+static int filter_retrieve(void *clientData, struct recRetrieveCtrl *ctrl)
{
return zebra_grs_retrieve(clientData, ctrl, grs_read_xml);
}
{
return zebra_grs_retrieve(clientData, ctrl, grs_read_xml);
}
-static struct recType xml_type = {
+static struct recType filter_type = {
+ 0,
"grs.xml",
"grs.xml",
- init_xml,
+ filter_init,
0,
0,
- destroy_xml,
- extract_xml,
- retrieve_xml,
+ filter_destroy,
+ filter_extract,
+ filter_retrieve,
};
RecType
};
RecType
@@
-527,7
+528,7
@@
idzebra_filter
#endif
[] = {
#endif
[] = {
- &xml_type,
+ &filter_type,
0,
};
0,
};