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
Bump year to 2015
[idzebra-moved-to-github.git]
/
index
/
inline.c
diff --git
a/index/inline.c
b/index/inline.c
index
c229695
..
7d90210
100644
(file)
--- a/
index/inline.c
+++ b/
index/inline.c
@@
-1,5
+1,5
@@
/* This file is part of the Zebra server.
/* This file is part of the Zebra server.
- Copyright (C) 1994-2009 Index Data
+ Copyright (C) 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
@@
-16,6
+16,9
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
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 <ctype.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
@@
-55,7
+58,7
@@
void inline_destroy_field(inline_field *p)
static inline_subfield *inline_mk_subfield(inline_subfield *parent)
{
inline_subfield *p = (inline_subfield *)xmalloc(sizeof(*p));
static inline_subfield *inline_mk_subfield(inline_subfield *parent)
{
inline_subfield *p = (inline_subfield *)xmalloc(sizeof(*p));
-
+
if (p)
{
memset(p, 0, sizeof(*p));
if (p)
{
memset(p, 0, sizeof(*p));
@@
-95,10
+98,10
@@
int inline_parse(inline_field *pif, const char *tag, const char *s)
{
inline_field *pf = pif;
char *p = (char *)s;
{
inline_field *pf = pif;
char *p = (char *)s;
-
+
if (!pf)
return -1;
if (!pf)
return -1;
-
+
if (pf->name[0] == '\0')
{
if ((sscanf(p, "%3s", pf->name)) != 1)
if (pf->name[0] == '\0')
{
if ((sscanf(p, "%3s", pf->name)) != 1)
@@
-120,10
+123,10
@@
int inline_parse(inline_field *pif, const char *tag, const char *s)
else
{
inline_subfield *psf = inline_mk_subfield(0);
else
{
inline_subfield *psf = inline_mk_subfield(0);
-
+
sscanf(tag, "%1s", psf->name);
psf->data = xstrdup(p);
sscanf(tag, "%1s", psf->name);
psf->data = xstrdup(p);
-
+
if (!pf->list)
{
pf->list = psf;
if (!pf->list)
{
pf->list = psf;