Merge master

[netatalk.git] / libatalk / dsi / dsi_init.c

diff --git a/libatalk/dsi/dsi_init.c b/libatalk/dsi/dsi_init.c
index 6a545e94376482884389c2d96b28e7a81d497bbb..ee75fcc71ebb26be21a7c3ca40241c352a1d2409 100644 (file)
--- a/libatalk/dsi/dsi_init.c
+++ b/libatalk/dsi/dsi_init.c
@@ -1,11 +1,13 @@
 /*
+ * $Id: dsi_init.c,v 1.10 2009-11-05 14:38:08 franklahm Exp $
+ *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -15,7 +17,7 @@
 
 DSI *dsi_init(const dsi_proto protocol, const char *program, 
              const char *hostname, const char *address,
-             const int port, const int proxy, const u_int32_t quantum)
+             const char *port, const int proxy, const uint32_t quantum)
 {
     DSI                *dsi;
 
@@ -26,13 +28,6 @@ DSI *dsi_init(const dsi_proto protocol, const char *program,
     dsi->server_quantum = quantum; /* default server quantum */
     dsi->program = program;
 
-    /* signals to block. we actually disable timers for "known" 
-     * large transfers (i.e., dsi_read/write). */
-    sigemptyset(&dsi->sigblockset);
-    sigaddset(&dsi->sigblockset, SIGTERM);
-    sigaddset(&dsi->sigblockset, SIGHUP);
-    sigaddset(&dsi->sigblockset, SIGALRM);
-    
     switch (protocol) {
       /* currently the only transport protocol that exists for dsi */
     case DSI_TCPIP: 
@@ -51,7 +46,7 @@ DSI *dsi_init(const dsi_proto protocol, const char *program,
     return dsi;
 }
 
-void dsi_setstatus(DSI *dsi, u_int8_t *status, const int slen)
+void dsi_setstatus(DSI *dsi, char *status, const size_t slen)
 {
     dsi->status = status;
     dsi->statuslen = slen;