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
Happy new year
[yaz-moved-to-github.git]
/
client
/
client.c
diff --git
a/client/client.c
b/client/client.c
index
ac7380c
..
8016a15
100644
(file)
--- a/
client/client.c
+++ b/
client/client.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.
*/
/** \file client.c
* See the file LICENSE for details.
*/
/** \file client.c
@@
-197,11
+197,12
@@
const char* query_type_as_string(QueryType q)
}
}
}
}
-static void do_hex_dump(const char* buf, int len)
+static void do_hex_dump(const char* buf, size_t len)
{
if (hex_dump)
{
{
if (hex_dump)
{
- int i,x;
+ size_t i;
+ int x;
for (i = 0; i < len ; i = i+16 )
{
printf(" %4.4d ",i);
for (i = 0; i < len ; i = i+16 )
{
printf(" %4.4d ",i);
@@
-590,7
+591,7
@@
static int parse_cmd_doc(const char **arg, ODR out, char **buf, int *len)
}
else if ((*arg)[0] == '<')
{
}
else if ((*arg)[0] == '<')
{
- long fsize;
+ size_t fsize;
FILE *inf;
const char *fname;
const char *arg_start = ++(*arg);
FILE *inf;
const char *fname;
const char *arg_start = ++(*arg);
@@
-889,7
+890,8
@@
static void display_record(Z_External *r)
{
print_record((const unsigned char *) r->u.octet_aligned->buf,
r->u.octet_aligned->len);
{
print_record((const unsigned char *) r->u.octet_aligned->buf,
r->u.octet_aligned->len);
- marc_file_write(r->u.octet_aligned->buf, r->u.octet_aligned->len);
+ marc_file_write((const char *) r->u.octet_aligned->buf,
+ r->u.octet_aligned->len);
}
else if (oid && r->which == Z_External_octet)
{
}
else if (oid && r->which == Z_External_octet)
{
@@
-980,7
+982,7
@@
static void display_record(Z_External *r)
return;
}
print_record(r->u.sutrs->buf, r->u.sutrs->len);
return;
}
print_record(r->u.sutrs->buf, r->u.sutrs->len);
- marc_file_write(r->u.sutrs->buf, r->u.sutrs->len);
+ marc_file_write((const char *) r->u.sutrs->buf, r->u.sutrs->len);
}
else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_grs_1))
{
}
else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_grs_1))
{
@@
-3914,7
+3916,7
@@
static void handle_srw_record(Z_SRW_record *rec)
if (rec->recordData_buf && rec->recordData_len)
{
if (fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout) !=
if (rec->recordData_buf && rec->recordData_len)
{
if (fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout) !=
- rec->recordData_len)
+ (size_t) (rec->recordData_len))
{
printf("write to stdout failed\n");
}
{
printf("write to stdout failed\n");
}