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
dirent wrapper. Use yaz_file_glob for XML include
[yaz-moved-to-github.git]
/
client
/
client.c
diff --git
a/client/client.c
b/client/client.c
index
87a87e6
..
9717d29
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-2009 Index Data
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
*/
/** \file client.c
* See the file LICENSE for details.
*/
/** \file client.c
@@
-141,7
+141,7
@@
static int scan_stepSize = 0;
static int scan_position = 1;
static int scan_size = 20;
static char cur_host[200];
static int scan_position = 1;
static int scan_size = 20;
static char cur_host[200];
-static int last_hit_count = 0;
+static Odr_int last_hit_count = 0;
typedef enum {
QueryType_Prefix,
typedef enum {
QueryType_Prefix,
@@
-1945,7
+1945,7
@@
static Z_External *create_external_itemRequest(void)
return r;
}
return r;
}
-static Z_External *create_external_ILL_APDU(int which)
+static Z_External *create_external_ILL_APDU(void)
{
struct ill_get_ctl ctl;
ILL_APDU *ill_apdu;
{
struct ill_get_ctl ctl;
ILL_APDU *ill_apdu;
@@
-2047,7
+2047,7
@@
static Z_External *create_ItemOrderExternal(const char *type, int itemno,
{
printf("using ILL-request\n");
r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
{
printf("using ILL-request\n");
r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
- create_external_ILL_APDU(ILL_APDU_ILL_Request);
+ create_external_ILL_APDU();
}
else if (!strcmp(type, "xml") || !strcmp(type, "3"))
{
}
else if (!strcmp(type, "xml") || !strcmp(type, "3"))
{
@@
-2775,7
+2775,7
@@
static void parse_show_args(const char *arg_c, char *setstring,
if ((p = strchr(arg, '+')))
{
if ((p = strchr(arg, '+')))
{
- *number = atoi(p + 1);
+ *number = odr_atoi(p + 1);
*p = '\0';
}
if (*arg)
*p = '\0';
}
if (*arg)
@@
-2786,7
+2786,7
@@
static void parse_show_args(const char *arg_c, char *setstring,
*start = 1;
}
else
*start = 1;
}
else
- *start = atoi(arg);
+ *start = odr_atoi(arg);
}
if (p && (p=strchr(p+1, '+')))
strcpy(setstring, p+1);
}
if (p && (p=strchr(p+1, '+')))
strcpy(setstring, p+1);
@@
-4965,7
+4965,10
@@
static void client(void)
{
line_in=readline(C_PROMPT);
if (!line_in)
{
line_in=readline(C_PROMPT);
if (!line_in)
+ {
+ putchar('\n');
break;
break;
+ }
#if HAVE_READLINE_HISTORY_H
if (*line_in)
add_history(line_in);
#if HAVE_READLINE_HISTORY_H
if (*line_in)
add_history(line_in);