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
Reformat: delete trailing whitespace
[idzebra-moved-to-github.git]
/
util
/
xpath.c
diff --git
a/util/xpath.c
b/util/xpath.c
index
cea10c7
..
ffb6eb0
100644
(file)
--- a/
util/xpath.c
+++ b/
util/xpath.c
@@
-1,5
+1,5
@@
/* This file is part of the Zebra server.
/* This file is part of the Zebra server.
- Copyright (C) 1995-2008 Index Data
+ Copyright (C) 1994-2011 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-18,6
+18,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
@@
-119,13
+122,13
@@
static struct xpath_predicate *get_xpath_boolean(char **pr, NMEM mem,
char **look, int *literal)
{
struct xpath_predicate *left = 0;
char **look, int *literal)
{
struct xpath_predicate *left = 0;
-
+
left = get_xpath_relation(pr, mem, look, literal);
if (!left)
return 0;
left = get_xpath_relation(pr, mem, look, literal);
if (!left)
return 0;
-
+
while (*look && !*literal &&
while (*look && !*literal &&
- (!strcmp(*look, "and") || !strcmp(*look, "or") ||
+ (!strcmp(*look, "and") || !strcmp(*look, "or") ||
!strcmp(*look, "not")))
{
struct xpath_predicate *res, *right;
!strcmp(*look, "not")))
{
struct xpath_predicate *res, *right;
@@
-161,13
+164,13
@@
int zebra_parse_xpath_str(const char *xpath_string,
{
const char *cp;
char *a;
{
const char *cp;
char *a;
-
+
int no = 0;
int no = 0;
-
+
if (!xpath_string || *xpath_string != '/')
return -1;
cp = xpath_string;
if (!xpath_string || *xpath_string != '/')
return -1;
cp = xpath_string;
-
+
while (*cp && no < max)
{
int i = 0;
while (*cp && no < max)
{
int i = 0;
@@
-215,7
+218,7
@@
void dump_xp_predicate (struct xpath_predicate *p)
if (p) {
if (p->which == XPATH_PREDICATE_RELATION &&
p->u.relation.name[0]) {
if (p) {
if (p->which == XPATH_PREDICATE_RELATION &&
p->u.relation.name[0]) {
- fprintf (stderr, "%s,%s,%s",
+ fprintf (stderr, "%s,%s,%s",
p->u.relation.name,
p->u.relation.op,
p->u.relation.value);
p->u.relation.name,
p->u.relation.op,
p->u.relation.value);
@@
-242,6
+245,7
@@
void dump_xp_steps (struct xpath_location_step *xpath, int no)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab