chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
+ * Documentation improved somewhat, including new GPL-vs-LGPL file.
[adns.git]
/
regress
/
harness.h.m4
diff --git
a/regress/harness.h.m4
b/regress/harness.h.m4
index 5f0c9f4b42f0f7a6a56953b22731349fd4c984d6..a25bd37ee79dbff73f99c45d9d4c28d276dcf4cc 100644
(file)
--- a/
regress/harness.h.m4
+++ b/
regress/harness.h.m4
@@
-2,7
+2,12
@@
m4_dnl harness.h.m4
m4_dnl (part of complex test harness, not of the library)
m4_dnl - function and other declarations
m4_dnl (part of complex test harness, not of the library)
m4_dnl - function and other declarations
-m4_dnl This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson
+m4_dnl This file is
+m4_dnl Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl
+m4_dnl It is part of adns, which is
+m4_dnl Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
m4_dnl
m4_dnl This program is free software; you can redistribute it and/or modify
m4_dnl it under the terms of the GNU General Public License as published by
m4_dnl
m4_dnl This program is free software; you can redistribute it and/or modify
m4_dnl it under the terms of the GNU General Public License as published by
@@
-23,20
+28,8
@@
m4_include(hmacros.i4)
#ifndef HARNESS_H_INCLUDED
#define HARNESS_H_INCLUDED
#ifndef HARNESS_H_INCLUDED
#define HARNESS_H_INCLUDED
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <unistd.h>
-
#include "internal.h"
#include "internal.h"
-
-/* We override several system calls with #define's */
-
-hm_create_proto_h
-m4_define(`hm_syscall', `int H$1(hm_args_massage($3,void));')
-m4_include(`hsyscalls.i4')
-
-int Hwritev(int fd, const struct iovec *vector, size_t count);
+#include "hsyscalls.h"
/* There is a Q function (Q for Question) for each such syscall;
* it constructs a string representing the call, and calls Q_str
/* There is a Q function (Q for Question) for each such syscall;
* it constructs a string representing the call, and calls Q_str
@@
-45,10
+38,13
@@
int Hwritev(int fd, const struct iovec *vector, size_t count);
hm_create_proto_q
m4_define(`hm_syscall', `void Q$1(hm_args_massage($3,void));')
hm_create_proto_q
m4_define(`hm_syscall', `void Q$1(hm_args_massage($3,void));')
+m4_define(`hm_specsyscall', `')
m4_include(`hsyscalls.i4')
void Q_vb(void);
m4_include(`hsyscalls.i4')
void Q_vb(void);
+extern void Tshutdown(void);
+
/* General help functions */
void Tfailed(const char *why);
/* General help functions */
void Tfailed(const char *why);
@@
-61,6
+57,7
@@
void Tmust(const char *call, const char *arg, int cond);
void Tvbf(const char *fmt, ...) PRINTFFORMAT(1,2);
void Tvbvf(const char *fmt, va_list al);
void Tvbfdset(int max, const fd_set *set);
void Tvbf(const char *fmt, ...) PRINTFFORMAT(1,2);
void Tvbvf(const char *fmt, va_list al);
void Tvbfdset(int max, const fd_set *set);
+void Tvbpollfds(const struct pollfd *fds, int nfds);
void Tvbaddr(const struct sockaddr *addr, int addrlen);
void Tvbbytes(const void *buf, int len);
void Tvberrno(int e);
void Tvbaddr(const struct sockaddr *addr, int addrlen);
void Tvbbytes(const void *buf, int len);
void Tvberrno(int e);
@@
-69,6
+66,7
@@
void Tvba(const char *str);
/* Shared globals */
extern vbuf vb;
/* Shared globals */
extern vbuf vb;
+extern struct timeval currenttime;
extern const struct Terrno { const char *n; int v; } Terrnos[];
#endif
extern const struct Terrno { const char *n; int v; } Terrnos[];
#endif