summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-07-14 17:07:21 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-07-14 17:07:21 +1000
commit8e2eb308d09f6bbf5c66c029090c527bc9346db8 (patch)
tree9ac9b34294eff11ba7ef2a99a1ad80bdc8a3305a
parent6c71d20d7689bf2c9c22f39b2355de8db975b586 (diff)
- dtucker@cvs.openbsd.org 2005/07/14 04:00:43
[misc.h] use __sentinel__ attribute; ok deraadt@ djm@ markus@
-rw-r--r--ChangeLog5
-rw-r--r--misc.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d4bcde07..152287c58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
20 - jmc@cvs.openbsd.org 2005/07/08 12:53:10 20 - jmc@cvs.openbsd.org 2005/07/08 12:53:10
21 [ssh_config.5] 21 [ssh_config.5]
22 new sentence, new line; 22 new sentence, new line;
23 - dtucker@cvs.openbsd.org 2005/07/14 04:00:43
24 [misc.h]
25 use __sentinel__ attribute; ok deraadt@ djm@ markus@
23 26
2420050707 2720050707
25 - dtucker [auth-krb5.c auth.h gss-serv-krb5.c] Move KRB5CCNAME generation for 28 - dtucker [auth-krb5.c auth.h gss-serv-krb5.c] Move KRB5CCNAME generation for
@@ -2818,4 +2821,4 @@
2818 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2821 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2819 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2822 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2820 2823
2821$Id: ChangeLog,v 1.3843 2005/07/14 07:06:50 dtucker Exp $ 2824$Id: ChangeLog,v 1.3844 2005/07/14 07:07:21 dtucker Exp $
diff --git a/misc.h b/misc.h
index 92848b28e..2d630feb5 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.h,v 1.24 2005/07/04 00:58:43 djm Exp $ */ 1/* $OpenBSD: misc.h,v 1.25 2005/07/14 04:00:43 dtucker Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -25,7 +25,7 @@ char *cleanhostname(char *);
25char *colon(char *); 25char *colon(char *);
26long convtime(const char *); 26long convtime(const char *);
27char *tilde_expand_filename(const char *, uid_t); 27char *tilde_expand_filename(const char *, uid_t);
28char *percent_expand(const char *, ...) __attribute__((sentinel)); 28char *percent_expand(const char *, ...) __attribute__((__sentinel__));
29char *tohex(const u_char *, u_int); 29char *tohex(const u_char *, u_int);
30 30
31struct passwd *pwcopy(struct passwd *); 31struct passwd *pwcopy(struct passwd *);