X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=f08d43a8e96cbaa607518615acdb22703a1cf292;hp=edab4871a03441dc1756054bfe0850b2a4e10c22;hb=9d8fdf8898418711558f70a9630b2444036d8285;hpb=58864df1c0784c58e421949b67a091fd0a60e140

diff --git a/para.h b/para.h
index edab4871..f08d43a8 100644
--- a/para.h
+++ b/para.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -19,13 +19,11 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <ctype.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <sys/un.h> /* needed by create_pf_socket */
 #include <string.h>
 #include <assert.h>
 #include <stdbool.h>
+#include <inttypes.h>
+#include <sys/uio.h>
 #include "gcc-compat.h"
 
 /** used in various contexts */
@@ -62,7 +60,7 @@ extern __printf_2_3 void (*para_log)(int, const char*, ...);
  *
  */
 #define DEFINE_STDERR_LOGGER(funcname, loglevel_barrier) \
-	__printf_2_3 void funcname(int ll, const char* fmt,...) \
+	static __printf_2_3 void funcname(int ll, const char* fmt,...) \
 	{ \
 		va_list argp; \
 		if (ll < loglevel_barrier) \
@@ -82,30 +80,24 @@ extern __printf_2_3 void (*para_log)(int, const char*, ...);
 
 /** Sent by para_client to initiate the authentication procedure. */
 #define AUTH_REQUEST_MSG "auth rsa "
-/** Sent by para_server for commands that expect a data file. */
-#define AWAITING_DATA_MSG "\nAwaiting Data."
-/** Sent by para_server if authentication was successful. */
-#define PROCEED_MSG "Proceed."
-/** Length of the \p PROCEED_MSG string. */
-#define PROCEED_MSG_LEN strlen(PROCEED_MSG)
-/** Sent by para_client to indicate the end of the command line. */
-#define EOC_MSG "\nEnd of Command."
 
 /* exec */
 int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds);
 
 /* time */
-int tv_diff(const struct timeval *b, const struct timeval *a, struct timeval *diff);
-long unsigned tv2ms(const struct timeval*);
-void d2tv(double, struct timeval*);
-void tv_add(const struct timeval*, const struct timeval *, struct timeval *);
-void tv_scale(const unsigned long, const struct timeval *, struct timeval *);
+int tv_diff(const struct timeval *b, const struct timeval *a,
+		struct timeval *diff);
+long unsigned tv2ms(const struct timeval *tv);
+void tv_add(const struct timeval *a, const struct timeval *b,
+		struct timeval *sum);
+void tv_scale(const unsigned long mult, const struct timeval *tv,
+		struct timeval *result);
 void tv_divide(const unsigned long divisor, const struct timeval *tv,
-	struct timeval *result);
+		struct timeval *result);
 int tv_convex_combination(const long a, const struct timeval *tv1,
 		const long b, const struct timeval *tv2,
 		struct timeval *result);
-void ms2tv(const long unsigned n, struct timeval *tv);
+void ms2tv(long unsigned n, struct timeval *tv);
 void compute_chunk_time(long unsigned chunk_num,
 		struct timeval *chunk_tv, struct timeval *stream_start,
 		struct timeval *result);
@@ -214,7 +206,7 @@ _static_inline_ bool iov_valid(const struct iovec *iov)
  *
  *	2. The wav header (para_write only).
  *
- *	3. The --format option of para_write.
+ *	3. The --sample-format option of para_write.
  */
 #define SAMPLE_FORMATS \
 	SAMPLE_FORMAT(SF_S8, "8 bit signed"), \