aboutsummaryrefslogtreecommitdiffstats
path: root/src/assuan-client.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2001-12-12 09:17:23 +0000
committerWerner Koch <[email protected]>2001-12-12 09:17:23 +0000
commitfa5bb5013db68a145938661777fa65df467fce1d (patch)
tree3eca86186ae4b47004163726fc00d68313c2267f /src/assuan-client.c
parentnew error codes (diff)
downloadlibassuan-fa5bb5013db68a145938661777fa65df467fce1d.tar.gz
libassuan-fa5bb5013db68a145938661777fa65df467fce1d.zip
* assuan-connect.c (assuan_pipe_connect): Implemented the inital
handshake. * assuan-client.c (read_from_server): Renamed to (_assuan_read_from_server): this and made external. * assuan-listen.c (assuan_set_hello_line): New. (assuan_accept): Use a custom hello line is available. * assuan-buffer.c (assuan_read_line): New. (assuan_pending_line): New. (_assuan_write_line): Renamed to .. (assuan_write_line): this, made public and changed all callers.
Diffstat (limited to 'src/assuan-client.c')
-rw-r--r--src/assuan-client.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/assuan-client.c b/src/assuan-client.c
index 03c7c09..a555cf3 100644
--- a/src/assuan-client.c
+++ b/src/assuan-client.c
@@ -32,8 +32,8 @@
#define xtoi_2(p) ((xtoi_1(p) * 16) + xtoi_1((p)+1))
-static AssuanError
-read_from_server (ASSUAN_CONTEXT ctx, int *okay, int *off)
+AssuanError
+_assuan_read_from_server (ASSUAN_CONTEXT ctx, int *okay, int *off)
{
char *line;
int linelen;
@@ -114,12 +114,12 @@ assuan_transact (ASSUAN_CONTEXT ctx,
unsigned char *line;
int linelen;
- rc = _assuan_write_line (ctx, command);
+ rc = assuan_write_line (ctx, command);
if (rc)
return rc;
again:
- rc = read_from_server (ctx, &okay, &off);
+ rc = _assuan_read_from_server (ctx, &okay, &off);
if (rc)
return rc; /* error reading from server */
@@ -162,8 +162,8 @@ assuan_transact (ASSUAN_CONTEXT ctx,
{
if (!inquire_cb)
{
- _assuan_write_line (ctx, "END"); /* get out of inquire mode */
- read_from_server (ctx, &okay, &off); /* dummy read the response */
+ assuan_write_line (ctx, "END"); /* get out of inquire mode */
+ _assuan_read_from_server (ctx, &okay, &off); /* dummy read */
rc = ASSUAN_No_Inquire_Callback;
}
else