Version bump.

[mLib] / conn.h

diff --git a/conn.h b/conn.h
index 5298ac0fe36e81c0b1523f07fee8aba8852d6158..d520a6fff24b3964a55bab4f6be2540b401ad998 100644 (file)
--- a/conn.h
+++ b/conn.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: conn.h,v 1.4 1999/05/26 21:08:01 mdw Exp $
+ * $Id: conn.h,v 1.6 2001/06/22 19:35:20 mdw Exp $

  *
  * Nonblocking connect handling
  *
  *
  * Nonblocking connect handling
  *


@@ -30,6 +30,16 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: conn.h,v $
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: conn.h,v $

+ * Revision 1.6  2001/06/22 19:35:20  mdw
+ * Interface change to @conn_init@ -- return error rather than calling the
+ * function.  This reduces the number of different environments the
+ * callback has to cope with, and the old behaviour is easily simulatable
+ * with the new, while simulating the new behaviour was awkward and
+ * painful.
+ *
+ * Revision 1.5  1999/12/10 23:42:04  mdw
+ * Change header file guard names.
+ *

  * Revision 1.4  1999/05/26 21:08:01  mdw
  * Remove redundant structure member.
  *
  * Revision 1.4  1999/05/26 21:08:01  mdw
  * Remove redundant structure member.
  *


@@ -45,8 +55,8 @@
  *
  */
 
  *
  */
 

-#ifndef CONN_H
-#define CONN_H
+#ifndef MLIB_CONN_H
+#define MLIB_CONN_H

 
 #ifdef __cplusplus
   extern "C" {
 
 #ifdef __cplusplus
   extern "C" {


@@ -57,7 +67,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
 

-#ifndef SEL_H
+#ifndef MLIB_SEL_H

 #  include "sel.h"
 #endif
 
 #  include "sel.h"
 #endif
 


@@ -83,7 +93,7 @@ typedef struct conn {
  *             @void (*func)(int fd, void *p) = handler function
  *             @void *p@ = argument for the handler function
  *
  *             @void (*func)(int fd, void *p) = handler function
  *             @void *p@ = argument for the handler function
  *

- * Returns:    ---
+ * Returns:    Zero on success, nonzero on failure.

  *
  * Use:                Sets up a nonblocking connect job.  The socket should already
  *             be bound if you care about that sort of thing.  When the
  *
  * Use:                Sets up a nonblocking connect job.  The socket should already
  *             be bound if you care about that sort of thing.  When the


@@ -94,10 +104,10 @@ typedef struct conn {
  *             In either case, the select job is then removed.
  */
 
  *             In either case, the select job is then removed.
  */
 

-extern void conn_init(conn */*c*/, sel_state */*s*/, int /*fd*/,
-                     struct sockaddr */*dst*/, int /*dsz*/,
-                     void (*/*func*/)(int /*fd*/, void */*p*/),
-                     void */*p*/);
+extern int conn_init(conn */*c*/, sel_state */*s*/, int /*fd*/,
+                    struct sockaddr */*dst*/, int /*dsz*/,
+                    void (*/*func*/)(int /*fd*/, void */*p*/),
+                    void */*p*/);

 
 /* --- @conn_kill@ --- *
  *
 
 /* --- @conn_kill@ --- *
  *