projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add debian make rule
[yaz-moved-to-github.git]
/
src
/
srwutil.c
diff --git
a/src/srwutil.c
b/src/srwutil.c
index
58d0d3b
..
6284831
100644
(file)
--- a/
src/srwutil.c
+++ b/
src/srwutil.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2009 Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-9,6
+9,7
@@
#include <stdlib.h>
#include <yaz/srw.h>
#include <stdlib.h>
#include <yaz/srw.h>
+#include <yaz/matchstr.h>
#include <yaz/yaz-iconv.h>
static int hex_digit (int ch)
#include <yaz/yaz-iconv.h>
static int hex_digit (int ch)
@@
-278,7
+279,7
@@
static void yaz_srw_decodeauth(Z_SRW_PDU *sr, Z_HTTP_Request *hreq,
}
#endif
}
#endif
-void yaz_uri_val_int(const char *path, const char *name, ODR o, int **intp)
+void yaz_uri_val_int(const char *path, const char *name, ODR o, Odr_int **intp)
{
const char *v = yaz_uri_val(path, name, o);
if (v)
{
const char *v = yaz_uri_val(path, name, o);
if (v)
@@
-462,7
+463,7
@@
int yaz_srw_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
#if YAZ_HAVE_XML2
static int yaz_sru_decode_integer(ODR odr, const char *pname,
#if YAZ_HAVE_XML2
static int yaz_sru_decode_integer(ODR odr, const char *pname,
- const char *valstr, int **valp,
+ const char *valstr, Odr_int **valp,
Z_SRW_diagnostic **diag, int *num_diag,
int min_value)
{
Z_SRW_diagnostic **diag, int *num_diag,
int min_value)
{
@@
-606,7
+607,7
@@
int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
Z_SRW_extra_arg **l = &extra_args;
while (*l)
l = &(*l)->next;
Z_SRW_extra_arg **l = &extra_args;
while (*l)
l = &(*l)->next;
- *l = odr_malloc(decode, sizeof(**l));
+ *l = (Z_SRW_extra_arg *) odr_malloc(decode, sizeof(**l));
(*l)->name = odr_strdup(decode, n);
(*l)->value = odr_strdup(decode, v);
(*l)->next = 0;
(*l)->name = odr_strdup(decode, n);
(*l)->value = odr_strdup(decode, v);
(*l)->next = 0;
@@
-1196,13
+1197,13
@@
int yaz_diag_srw_to_bib1(int code)
}
static void add_val_int(ODR o, char **name, char **value, int *i,
}
static void add_val_int(ODR o, char **name, char **value, int *i,
- char *a_name, int *val)
+ char *a_name, Odr_int *val)
{
if (val)
{
name[*i] = a_name;
{
if (val)
{
name[*i] = a_name;
- value[*i] = (char *) odr_malloc(o, 30);
- sprintf(value[*i], "%d", *val);
+ value[*i] = (char *) odr_malloc(o, 40);
+ sprintf(value[*i], ODR_INT_PRINTF, *val);
(*i)++;
}
}
(*i)++;
}
}
@@
-1454,7
+1455,7
@@
void yaz_encode_sru_extra(Z_SRW_PDU *sr, ODR odr, const char *extra_args)
while (*name)
{
while (*name)
{
- *ea = odr_malloc(odr, sizeof(**ea));
+ *ea = (Z_SRW_extra_arg *) odr_malloc(odr, sizeof(**ea));
(*ea)->name = *name;
(*ea)->value = *val;
ea = &(*ea)->next;
(*ea)->name = *name;
(*ea)->value = *val;
ea = &(*ea)->next;
@@
-1470,6
+1471,7
@@
void yaz_encode_sru_extra(Z_SRW_PDU *sr, ODR odr, const char *extra_args)
/*
* 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