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
Fixed bug #729: Bad error message when starting with an invalid address.
[yaz-moved-to-github.git]
/
client
/
client.c
diff --git
a/client/client.c
b/client/client.c
index
0029c09
..
396be27
100644
(file)
--- a/
client/client.c
+++ b/
client/client.c
@@
-2,7
+2,7
@@
* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.314 2006-09-07 11:31:39 adam Exp $
+ * $Id: client.c,v 1.318 2006-11-08 08:55:50 adam Exp $
*/
/** \file client.c
* \brief yaz-client program
*/
/** \file client.c
* \brief yaz-client program
@@
-180,7
+180,7
@@
int cmd_register_tab(const char* arg);
static void close_session (void);
static void close_session (void);
-ODR getODROutputStream()
+ODR getODROutputStream(void)
{
return out;
}
{
return out;
}
@@
-686,7
+686,7
@@
int session_connect(const char *arg)
conn = cs_create_host(arg, 1, &add);
if (!conn)
{
conn = cs_create_host(arg, 1, &add);
if (!conn)
{
- printf ("Couldn't create comstack\n");
+ printf ("Could not resolve address %s\n", arg);
return 0;
}
#if YAZ_HAVE_XML2
return 0;
}
#if YAZ_HAVE_XML2
@@
-711,12
+711,6
@@
int session_connect(const char *arg)
if (cs_connect(conn, add) < 0)
{
printf ("error = %s\n", cs_strerror(conn));
if (cs_connect(conn, add) < 0)
{
printf ("error = %s\n", cs_strerror(conn));
- if (conn->cerrno == CSYSERR)
- {
- char msg[256];
- yaz_strerror(msg, sizeof(msg));
- printf ("%s\n", msg);
- }
cs_close(conn);
conn = 0;
return 0;
cs_close(conn);
conn = 0;
return 0;
@@
-766,7
+760,7
@@
int cmd_open(const char *arg)
return session_connect(cur_host);
}
return session_connect(cur_host);
}
-void try_reconnect()
+void try_reconnect(void)
{
char* open_command;
{
char* open_command;
@@
-1410,7
+1404,7
@@
static int send_SRW_searchRequest(const char *arg)
if (record_schema)
sr->u.request->recordSchema = record_schema;
if (recordsyntax_size == 1 && recordsyntax_list[0] == VAL_TEXT_XML)
if (record_schema)
sr->u.request->recordSchema = record_schema;
if (recordsyntax_size == 1 && recordsyntax_list[0] == VAL_TEXT_XML)
- sr->u.explain_request->recordPacking = "xml";
+ sr->u.request->recordPacking = "xml";
return send_srw(sr);
}
#endif
return send_srw(sr);
}
#endif
@@
-1891,7
+1885,7
@@
const char *get_ill_element (void *clientData, const char *element)
return 0;
}
return 0;
}
-static Z_External *create_external_itemRequest()
+static Z_External *create_external_itemRequest(void)
{
struct ill_get_ctl ctl;
ILL_ItemRequest *req;
{
struct ill_get_ctl ctl;
ILL_ItemRequest *req;
@@
-2102,7
+2096,7
@@
static int send_itemorder(const char *type, int itemno)
return 0;
}
return 0;
}
-static int only_z3950()
+static int only_z3950(void)
{
if (!conn)
{
{
if (!conn)
{
@@
-2294,6
+2288,7
@@
static int cmd_xmles(const char *arg)
return 1;
else
{
return 1;
else
{
+ char *asn_buf = 0;
int noread = 0;
char oid_str[51];
int oid_value_xmles = VAL_XMLES;
int noread = 0;
char oid_str[51];
int oid_value_xmles = VAL_XMLES;
@@
-2322,10
+2317,13
@@
static int cmd_xmles(const char *arg)
printf("Bad OID: %s\n", oid_str);
return 0;
}
printf("Bad OID: %s\n", oid_str);
return 0;
}
-
- if (parse_cmd_doc(&arg, out, (char **) &ext->u.single_ASN1_type->buf,
+
+ if (parse_cmd_doc(&arg, out, &asn_buf,
&ext->u.single_ASN1_type->len, 0) == 0)
return 0;
&ext->u.single_ASN1_type->len, 0) == 0)
return 0;
+
+ ext->u.single_ASN1_type->buf = (unsigned char *) asn_buf;
+
req->packageType = yaz_oidval_to_z3950oid(out, CLASS_EXTSERV,
oid_value_xmles);
req->packageType = yaz_oidval_to_z3950oid(out, CLASS_EXTSERV,
oid_value_xmles);
@@
-3638,7
+3636,7
@@
int cmd_push_command(const char* arg)
return 1;
}
return 1;
}
-void source_rcfile()
+void source_rcfile(void)
{
/* Look for a $HOME/.yazclientrc and source it if it exists */
struct stat statbuf;
{
/* Look for a $HOME/.yazclientrc and source it if it exists */
struct stat statbuf;