Minor modifications for the transport configuration change.

diff --git a/tx-socket.c b/tx-socket.c
index 8fcf9688e4b97bd4ab935f878feec681abda3245..394b8b66f15b85a09be1b8063f68d3f6b6ab3bd0 100644 (file)
--- a/tx-socket.c
+++ b/tx-socket.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: tx-socket.c,v 1.1 2002/01/25 19:34:45 mdw Exp $
+ * $Id: tx-socket.c,v 1.2 2002/01/30 09:25:35 mdw Exp $

  *
  * Socket transport
  *
  *
  * Socket transport
  *


@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: tx-socket.c,v $
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: tx-socket.c,v $

+ * Revision 1.2  2002/01/30 09:25:35  mdw
+ * Minor modifications for the transport configuration change.
+ *

  * Revision 1.1  2002/01/25 19:34:45  mdw
  * Initial revision
  *
  * Revision 1.1  2002/01/25 19:34:45  mdw
  * Initial revision
  *


@@ -74,28 +77,19 @@ typedef struct txsock {
 /* --- @txsock_create@ --- *
  *
  * Arguments:  @const char *file@ = filename for socket
 /* --- @txsock_create@ --- *
  *
  * Arguments:  @const char *file@ = filename for socket

- *             @const char *config@ = configuration string

  *
  * Returns:    Pointer to created transport block.
  *
  * Use:                Creates a socket transport.
  */
 
  *
  * Returns:    Pointer to created transport block.
  *
  * Use:                Creates a socket transport.
  */
 

-txport *txsock_create(const char *file, const char *config)
+txport *txsock_create(const char *file)

 {
   txsock *tx;
   int fd;
   struct sockaddr_un *sun;
   size_t len, sunsz;
 
 {
   txsock *tx;
   int fd;
   struct sockaddr_un *sun;
   size_t len, sunsz;
 

-  /* --- Parse the configuration --- */
-
-  if (config && *config) {
-    err_report(ERR_TXPORT, ERRTX_CONFIG, 0,
-              "bad configuration for socket transport");
-    goto fail_0;
-  }
-

   /* --- Set up the address block --- */
 
   len = strlen(file) + 1;
   /* --- Set up the address block --- */
 
   len = strlen(file) + 1;


@@ -109,7 +103,7 @@ txport *txsock_create(const char *file, const char *config)
   if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
     err_report(ERR_TXPORT, ERRTX_CREATE, errno,
               "error creating socket: %s", strerror(errno));
   if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
     err_report(ERR_TXPORT, ERRTX_CREATE, errno,
               "error creating socket: %s", strerror(errno));

-    goto fail_1;
+    goto fail_0;

   }
 
   /* --- Connect --- */
   }
 
   /* --- Connect --- */


@@ -117,7 +111,7 @@ txport *txsock_create(const char *file, const char *config)
   if (connect(fd, (struct sockaddr *)sun, sunsz)) {
     err_report(ERR_TXPORT, ERRTX_CREATE, errno,
               "couldn't connect to `%s': %s", file, strerror(errno));
   if (connect(fd, (struct sockaddr *)sun, sunsz)) {
     err_report(ERR_TXPORT, ERRTX_CREATE, errno,
               "couldn't connect to `%s': %s", file, strerror(errno));

-    goto fail_2;
+    goto fail_1;

   }
 
   /* --- Done --- */
   }
 
   /* --- Done --- */


@@ -129,11 +123,10 @@ txport *txsock_create(const char *file, const char *config)
 
   /* --- Tidy up because it all went horribly wrong --- */
 
 
   /* --- Tidy up because it all went horribly wrong --- */
 

-fail_2:
-  close(fd);

 fail_1:
 fail_1:

-  xfree(sun);
+  close(fd);

 fail_0:
 fail_0:

+  xfree(sun);

   return (0);
 }
 
   return (0);
 }
 

diff --git a/tx-socket.h b/tx-socket.h
index f6e4d005f5f8a9c95dad66ecf915f72c71cf0fea..a461c59ad1340a8decc7029c9f3211dadf40de33 100644 (file)
--- a/tx-socket.h
+++ b/tx-socket.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: tx-socket.h,v 1.1 2002/01/25 19:34:45 mdw Exp $
+ * $Id: tx-socket.h,v 1.2 2002/01/30 09:25:35 mdw Exp $

  *
  * Socket transport
  *
  *
  * Socket transport
  *


@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: tx-socket.h,v $
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: tx-socket.h,v $

+ * Revision 1.2  2002/01/30 09:25:35  mdw
+ * Minor modifications for the transport configuration change.
+ *

  * Revision 1.1  2002/01/25 19:34:45  mdw
  * Initial revision
  *
  * Revision 1.1  2002/01/25 19:34:45  mdw
  * Initial revision
  *


@@ -53,7 +56,7 @@
 
 /*----- Functions provided ------------------------------------------------*/
 
 
 /*----- Functions provided ------------------------------------------------*/
 

-extern txport *txsock_create(const char */*file*/, const char */*config*/);
+extern txport *txsock_create(const char */*file*/);

 extern void *txsock_fetch(void */*txv*/);
 extern ssize_t txsock_write(txport */*txg*/,
                            const void */*p*/, size_t /*sz*/);
 extern void *txsock_fetch(void */*txv*/);
 extern ssize_t txsock_write(txport */*txg*/,
                            const void */*p*/, size_t /*sz*/);


@@ -68,7 +71,7 @@ extern void txsock_destroy(txport */*txg*/);
 
    static txport_ops txsock_ops = {
      TX_LIST, "socket", txsock_fv, 0,
 
    static txport_ops txsock_ops = {
      TX_LIST, "socket", txsock_fv, 0,

-     txsock_create, txsock_fetch, txsock_write, txsock_destroy
+     txsock_create, 0, txsock_fetch, txsock_write, txsock_destroy

    };
 #  undef TX_LIST
 #  define TX_LIST &txsock_ops
    };
 #  undef TX_LIST
 #  define TX_LIST &txsock_ops