Imported Upstream version 2.5.1

[debian/amanda] / common-src / dgram.h

diff --git a/common-src/dgram.h b/common-src/dgram.h
index 6a58346f632f8dd515361dbe64b015c6c217e926..dbacc9f4b869fd73f1b2a077409468dee39c32b4 100644 (file)
--- a/common-src/dgram.h
+++ b/common-src/dgram.h
@@ -1,6 +1,6 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
- * Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 1991-1999 University of Maryland at College Park
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -25,7 +25,7 @@
  *                        University of Maryland at College Park
  */
 /*
- * $Id: dgram.h,v 1.6.2.2.4.1.2.1 2002/03/24 19:23:23 jrjackson Exp $
+ * $Id: dgram.h,v 1.15 2006/05/25 01:47:11 johnfranks Exp $
  *
  * interface for datagram module
  */
@@ -44,21 +44,18 @@
 typedef struct dgram_s {
     char *cur;
     int socket;
-    int len;
+    size_t len;
     char data[MAX_DGRAM+1];
 } dgram_t;
 
-int dgram_bind P((dgram_t *dgram, int *portp));
-void dgram_socket P((dgram_t *dgram, int sock));
-int dgram_send P((char *hostname, int port, dgram_t *dgram));
-int dgram_send_addr P((struct sockaddr_in addr, dgram_t *dgram));
-int dgram_recv P((dgram_t *dgram, int timeout, struct sockaddr_in *fromaddr));
-void dgram_zero P((dgram_t *dgram));
-void dgram_cat P((dgram_t *dgram, const char *str));
-void dgram_eatline P((dgram_t *dgram));
-
-extern dgram_t  *debug_dgram_alloc  P((char *c, int l));
-
-#define        dgram_alloc()           debug_dgram_alloc(__FILE__, __LINE__)
+int    dgram_bind(dgram_t *dgram, in_port_t *portp);
+void   dgram_socket(dgram_t *dgram, int sock);
+int    dgram_send(char *hostname, in_port_t port, dgram_t *dgram);
+int    dgram_send_addr(struct sockaddr_in addr, dgram_t *dgram);
+ssize_t        dgram_recv(dgram_t *dgram, int timeout, struct sockaddr_in *fromaddr);
+void   dgram_zero(dgram_t *dgram);
+int    dgram_cat(dgram_t *dgram, const char *fmt, ...)
+    __attribute__ ((format (printf, 2, 3)));
+void dgram_eatline(dgram_t *dgram);
 
 #endif /* ! DGRAM_H */