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
For OIDs use Odr_oid type everywhere, i.e. do not assume Odr_oid=int.
[yaz-moved-to-github.git]
/
src
/
statserv.c
diff --git
a/src/statserv.c
b/src/statserv.c
index
4a8bad6
..
7d108d7
100644
(file)
--- a/
src/statserv.c
+++ b/
src/statserv.c
@@
-1,11
+1,11
@@
/*
/*
- * Copyright (C) 1995-2006, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* NT threaded server code by
* Chas Woodfield, Fretwell Downing Informatics.
*
* See the file LICENSE for details.
*
* NT threaded server code by
* Chas Woodfield, Fretwell Downing Informatics.
*
- * $Id: statserv.c,v 1.45 2006-10-09 11:21:37 adam Exp $
+ * $Id: statserv.c,v 1.49 2007-05-06 20:12:20 adam Exp $
*/
/**
*/
/**
@@
-92,7
+92,6
@@
statserv_options_block control_block = {
1, /* dynamic mode */
0, /* threaded mode */
0, /* one shot (single session) */
1, /* dynamic mode */
0, /* threaded mode */
0, /* one shot (single session) */
- 0, /* __UNUSED_loglevel */
"", /* no PDUs */
"", /* diagnostic output to stderr */
"tcp:@:9999", /* default listener port */
"", /* no PDUs */
"", /* diagnostic output to stderr */
"tcp:@:9999", /* default listener port */
@@
-184,7
+183,7
@@
static char *nmem_dup_xml_content(NMEM n, xmlNodePtr ptr)
len += xmlStrlen(p->content);
}
/* now allocate for the string */
len += xmlStrlen(p->content);
}
/* now allocate for the string */
- str = nmem_malloc(n, len);
+ str = (unsigned char *) nmem_malloc(n, len);
*str = '\0'; /* so we can use strcat */
for (p = ptr; p; p = p->next)
{
*str = '\0'; /* so we can use strcat */
for (p = ptr; p; p = p->next)
{
@@
-213,7
+212,8
@@
static char *nmem_dup_xml_content(NMEM n, xmlNodePtr ptr)
static struct gfs_server * gfs_server_new(void)
{
static struct gfs_server * gfs_server_new(void)
{
- struct gfs_server *n = nmem_malloc(gfs_nmem, sizeof(*n));
+ struct gfs_server *n = (struct gfs_server *)
+ nmem_malloc(gfs_nmem, sizeof(*n));
memcpy(&n->cb, &control_block, sizeof(control_block));
n->next = 0;
n->host = 0;
memcpy(&n->cb, &control_block, sizeof(control_block));
n->next = 0;
n->host = 0;
@@
-232,7
+232,8
@@
static struct gfs_server * gfs_server_new(void)
static struct gfs_listen * gfs_listen_new(const char *id,
const char *address)
{
static struct gfs_listen * gfs_listen_new(const char *id,
const char *address)
{
- struct gfs_listen *n = nmem_malloc(gfs_nmem, sizeof(*n));
+ struct gfs_listen *n = (struct gfs_listen *)
+ nmem_malloc(gfs_nmem, sizeof(*n));
if (id)
n->id = nmem_strdup(gfs_nmem, id);
else
if (id)
n->id = nmem_strdup(gfs_nmem, id);
else
@@
-433,7
+434,7
@@
static void xml_config_read(void)
else if (!strcmp((const char *) ptr->name, "stylesheet"))
{
char *s = nmem_dup_xml_content(gfs_nmem, ptr->children);
else if (!strcmp((const char *) ptr->name, "stylesheet"))
{
char *s = nmem_dup_xml_content(gfs_nmem, ptr->children);
- gfs->stylesheet =
+ gfs->stylesheet = (char *)
nmem_malloc(gfs_nmem, strlen(s) + 2);
sprintf(gfs->stylesheet, "/%s", s);
}
nmem_malloc(gfs_nmem, strlen(s) + 2);
sprintf(gfs->stylesheet, "/%s", s);
}
@@
-982,7
+983,7
@@
static void *new_session (void *vp)
association *newas;
IOCHAN new_chan;
COMSTACK new_line = (COMSTACK) vp;
association *newas;
IOCHAN new_chan;
COMSTACK new_line = (COMSTACK) vp;
- IOCHAN parent_chan = new_line->user;
+ IOCHAN parent_chan = (IOCHAN) new_line->user;
unsigned cs_get_mask, cs_accept_mask, mask =
((new_line->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) |
unsigned cs_get_mask, cs_accept_mask, mask =
((new_line->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) |
@@
-1111,7
+1112,11
@@
static int add_listener(char *where, int listen_id)
if (cs_bind(l, ap, CS_SERVER) < 0)
{
if (cs_bind(l, ap, CS_SERVER) < 0)
{
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to bind to %s", where);
+ if (cs_errno(l) == CSYSERR)
+ yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to bind to %s", where);
+ else
+ yaz_log(YLOG_FATAL, "Failed to bind to %s: %s", where,
+ cs_strerror(l));
cs_close (l);
return -1;
}
cs_close (l);
return -1;
}
@@
-1150,7
+1155,8
@@
statserv_options_block *statserv_getcontrol(void)
return &control_block;
#elif YAZ_POSIX_THREADS
if (init_control_tls)
return &control_block;
#elif YAZ_POSIX_THREADS
if (init_control_tls)
- return pthread_getspecific(current_control_tls);
+ return (statserv_options_block *)
+ pthread_getspecific(current_control_tls);
else
return &control_block;
#else
else
return &control_block;
#else