- (dtucker) [openbsd-compat/getenv.c] Make __findenv static, remove

unnecessary prototype.
This commit is contained in:
Darren Tucker 2005-11-10 10:13:06 +11:00
parent b8c89d14bb
commit 32b531067d
2 changed files with 5 additions and 7 deletions

View File

@ -2,6 +2,8 @@
- (dtucker) [openbsd-compat/getenv.c] Merge changes for __findenv from - (dtucker) [openbsd-compat/getenv.c] Merge changes for __findenv from
OpenBSD getenv.c revs 1.4 - 1.8 (ANSIfication of arguments, removal of OpenBSD getenv.c revs 1.4 - 1.8 (ANSIfication of arguments, removal of
"register"). "register").
- (dtucker) [openbsd-compat/getenv.c] Make __findenv static, remove
unnecessary prototype.
20051105 20051105
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -3244,4 +3246,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3955 2005/11/09 23:10:10 dtucker Exp $ $Id: ChangeLog,v 1.3956 2005/11/09 23:13:06 dtucker Exp $

View File

@ -39,9 +39,7 @@ static char *rcsid = "$OpenBSD: setenv.c,v 1.6 2003/06/02 20:18:38 millert Exp $
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
char *__findenv(const char *name, int *offset); /* OpenSSH Portable: __findenv is from getenv.c rev 1.8, made static */
/* OpenSSH Portable: __findenv is from getenv.c rev 1.8 */
/* /*
* __findenv -- * __findenv --
@ -49,10 +47,8 @@ char *__findenv(const char *name, int *offset);
* Sets offset to be the offset of the name/value combination in the * Sets offset to be the offset of the name/value combination in the
* environmental array, for use by setenv(3) and unsetenv(3). * environmental array, for use by setenv(3) and unsetenv(3).
* Explicitly removes '=' in argument name. * Explicitly removes '=' in argument name.
*
* This routine *should* be a static; don't use it.
*/ */
char * static char *
__findenv(const char *name, int *offset) __findenv(const char *name, int *offset)
{ {
extern char **environ; extern char **environ;