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
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
[yaz-moved-to-github.git]
/
src
/
unix.c
diff --git
a/src/unix.c
b/src/unix.c
index
6aebb25
..
5d6cad1
100644
(file)
--- a/
src/unix.c
+++ b/
src/unix.c
@@
-1,9
+1,6
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: unix.c,v 1.19 2007-06-05 05:42:07 adam Exp $
- * UNIX socket COMSTACK. By Morten Bøgeskov.
*/
/**
* \file unix.c
*/
/**
* \file unix.c
@@
-90,7
+87,7
@@
typedef struct unix_state
int written; /* -1 if we aren't writing */
int towrite; /* to verify against user input */
int written; /* -1 if we aren't writing */
int towrite; /* to verify against user input */
- int (*complete)(const unsigned char *buf, int len); /* length/comple. */
+ int (*complete)(const char *buf, int len); /* length/complete. */
struct sockaddr_un addr; /* returned by cs_straddr */
int uid;
int gid;
struct sockaddr_un addr; /* returned by cs_straddr */
int uid;
int gid;
@@
-309,8
+306,7
@@
static int unix_more(COMSTACK h)
{
unix_state *sp = (unix_state *)h->cprivate;
{
unix_state *sp = (unix_state *)h->cprivate;
- return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf,
- sp->altlen);
+ return sp->altlen && (*sp->complete)(sp->altbuf, sp->altlen);
}
/*
}
/*
@@
-575,7
+571,7
@@
static int unix_get(COMSTACK h, char **buf, int *bufsize)
sp->altsize = tmpi;
}
h->io_pending = 0;
sp->altsize = tmpi;
}
h->io_pending = 0;
- while (!(berlen = (*sp->complete)((unsigned char *)*buf, hasread)))
+ while (!(berlen = (*sp->complete)(*buf, hasread)))
{
if (!*bufsize)
{
{
if (!*bufsize)
{