diff options
author | deraadt@openbsd.org <deraadt@openbsd.org> | 2016-09-12 01:22:38 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-09-12 13:46:29 +1000 |
commit | 9136ec134c97a8aff2917760c03134f52945ff3c (patch) | |
tree | bfcab357e6e0f510d9b63bac43b18097e89fa58a /sftp-server.c | |
parent | f219fc8f03caca7ac82a38ed74bbd6432a1195e7 (diff) |
upstream commit
Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then
use those definitions rather than pulling <sys/param.h> and unknown namespace
pollution. ok djm markus dtucker
Upstream-ID: 712cafa816c9f012a61628b66b9fbd5687223fb8
Diffstat (limited to 'sftp-server.c')
-rw-r--r-- | sftp-server.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sftp-server.c b/sftp-server.c index 646286a3c..3619cdfc0 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-server.c,v 1.109 2016/02/15 09:47:49 dtucker Exp $ */ | 1 | /* $OpenBSD: sftp-server.c,v 1.110 2016/09/12 01:22:38 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -17,7 +17,6 @@ | |||
17 | 17 | ||
18 | #include "includes.h" | 18 | #include "includes.h" |
19 | 19 | ||
20 | #include <sys/param.h> /* MIN */ | ||
21 | #include <sys/types.h> | 20 | #include <sys/types.h> |
22 | #include <sys/stat.h> | 21 | #include <sys/stat.h> |
23 | #ifdef HAVE_SYS_TIME_H | 22 | #ifdef HAVE_SYS_TIME_H |
@@ -505,7 +504,7 @@ status_to_message(u_int32_t status) | |||
505 | "Operation unsupported", /* SSH_FX_OP_UNSUPPORTED */ | 504 | "Operation unsupported", /* SSH_FX_OP_UNSUPPORTED */ |
506 | "Unknown error" /* Others */ | 505 | "Unknown error" /* Others */ |
507 | }; | 506 | }; |
508 | return (status_messages[MIN(status,SSH2_FX_MAX)]); | 507 | return (status_messages[MINIMUM(status,SSH2_FX_MAX)]); |
509 | } | 508 | } |
510 | 509 | ||
511 | static void | 510 | static void |