From 161413647a71b0dc991feb520394cbfd367e862a Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Wed, 12 Aug 1992 03:31:34 +0000
Subject: [PATCH] This commit was generated by cvs2svn to compensate for
changes in r488, which included commits to RCS files with non-trunk default
branches.
---
src/libraries/libisc-new/demo/tcp.c | 2 +-
src/libraries/libisc-new/src/intern.h | 4 ++++
src/libraries/libisc-new/src/isc.h | 5 +++++
src/libraries/libisc-new/src/isc_event.c | 4 ++--
src/libraries/libisc-new/src/isc_queue.c | 3 ++-
5 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/libraries/libisc-new/demo/tcp.c b/src/libraries/libisc-new/demo/tcp.c
index cf39316c9..563ca879a 100644
--- a/src/libraries/libisc-new/demo/tcp.c
+++ b/src/libraries/libisc-new/demo/tcp.c
@@ -73,7 +73,7 @@ main(void)
/*
** Enable remote connection attempts at port #20000 and #20001
*/
- if (isc_listentcp(mcb, "localhost", "20000") == NULL)
+ if (isc_listentcp(mcb, "localhost", "test-service") == NULL)
Perror("isc_listentcp-20000");
if (isc_listentcp(mcb, NULL, "20001") == NULL)
diff --git a/src/libraries/libisc-new/src/intern.h b/src/libraries/libisc-new/src/intern.h
index e811a6fc1..800d7ed00 100644
--- a/src/libraries/libisc-new/src/intern.h
+++ b/src/libraries/libisc-new/src/intern.h
@@ -40,8 +40,12 @@ isc_strdup(const char *str);
extern IscMsgQueue *
isc_newqueue(void);
+#if 0
extern int
isc_pollqueue(IscMsgQueue *queue);
+#else
+#define isc_pollqueue(qp) ((qp) != NULL && ((qp)->head != NULL))
+#endif
extern void
isc_killqueue(IscMsgQueue *queue);
diff --git a/src/libraries/libisc-new/src/isc.h b/src/libraries/libisc-new/src/isc.h
index 0ec7d43dd..6c447bf48 100644
--- a/src/libraries/libisc-new/src/isc.h
+++ b/src/libraries/libisc-new/src/isc.h
@@ -485,6 +485,11 @@ isc_flush(IscSession * scb);
extern int
isc_send(IscSession * scb, IscMessage * mcb);
+extern int
+isc_sendto(IscSession * scb,
+ IscAddress * ap,
+ IscMessage * mcb);
+
/*
diff --git a/src/libraries/libisc-new/src/isc_event.c b/src/libraries/libisc-new/src/isc_event.c
index 490c8d957..601e57b57 100644
--- a/src/libraries/libisc-new/src/isc_event.c
+++ b/src/libraries/libisc-new/src/isc_event.c
@@ -11,6 +11,7 @@
** 910303 ceder clean up. Removed everything that is lyskom-specific.
** 910304 pen really removed everything lyskom-specific.. :-)
** 920129 pen added support for "lazy" connect
+** 920805 pen one unneccessary isc_pollqueue() removed.
*/
#include <stdio.h>
@@ -307,10 +308,9 @@ RETRY:
scb = isl->scb;
- if (isc_pollqueue(scb->rd_msg_q))
+ if (event->msg = isc_popqueue(scb->rd_msg_q))
{
event->session = scb;
- event->msg = isc_popqueue(scb->rd_msg_q);
event->event = ISC_EVENT_MESSAGE;
/* Move the session pointer to the next in the circular queue */
diff --git a/src/libraries/libisc-new/src/isc_queue.c b/src/libraries/libisc-new/src/isc_queue.c
index e2521a0b3..9ef41e16d 100644
--- a/src/libraries/libisc-new/src/isc_queue.c
+++ b/src/libraries/libisc-new/src/isc_queue.c
@@ -30,12 +30,13 @@ isc_newqueue(void)
/* Return TRUE if the queue is not empty. */
+#ifndef isc_pollqueue
int
isc_pollqueue(IscMsgQueue * queue)
{
return queue != NULL && queue->head != NULL;
}
-
+#endif
void
isc_killqueue(IscMsgQueue * queue)
--
GitLab