summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--misc.h21
2 files changed, 13 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index bfcd160e2..161c4dde7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -132,6 +132,7 @@
132 cleanup all channels. 132 cleanup all channels.
133 - (bal) forget a few new files in sync up. 133 - (bal) forget a few new files in sync up.
134 - (bal) Makefile fix up requires scard.c 134 - (bal) Makefile fix up requires scard.c
135 - (stevesk) sync misc.h
135 136
13620010629 13720010629
137 - (bal) Removed net_aton() since we don't use it any more 138 - (bal) Removed net_aton() since we don't use it any more
@@ -5959,4 +5960,4 @@
5959 - Wrote replacements for strlcpy and mkdtemp 5960 - Wrote replacements for strlcpy and mkdtemp
5960 - Released 1.0pre1 5961 - Released 1.0pre1
5961 5962
5962$Id: ChangeLog,v 1.1378 2001/07/04 05:40:19 mouring Exp $ 5963$Id: ChangeLog,v 1.1379 2001/07/04 17:25:54 stevesk Exp $
diff --git a/misc.h b/misc.h
index 5f0b0aa4f..fc5645271 100644
--- a/misc.h
+++ b/misc.h
@@ -12,14 +12,16 @@
12 * called by a name other than "ssh" or "Secure Shell". 12 * called by a name other than "ssh" or "Secure Shell".
13 */ 13 */
14 14
15char *chop(char *); 15char *chop(char *);
16char *strdelim(char **); 16char *strdelim(char **);
17void set_nonblock(int); 17void set_nonblock(int);
18void unset_nonblock(int); 18void unset_nonblock(int);
19int a2port(const char *); 19int a2port(const char *);
20char *cleanhostname(char *); 20char *cleanhostname(char *);
21char *colon(char *); 21char *colon(char *);
22long convtime(const char *); 22long convtime(const char *);
23
24struct passwd *pwcopy(struct passwd *);
23 25
24typedef struct arglist arglist; 26typedef struct arglist arglist;
25struct arglist { 27struct arglist {
@@ -27,8 +29,7 @@ struct arglist {
27 int num; 29 int num;
28 int nalloc; 30 int nalloc;
29}; 31};
30 32void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
31void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
32 33
33/* wrapper for signal interface */ 34/* wrapper for signal interface */
34typedef void (*mysig_t)(int); 35typedef void (*mysig_t)(int);