summaryrefslogtreecommitdiff
path: root/openbsd-compat/setenv.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-11-10 10:10:10 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-11-10 10:10:10 +1100
commitb8c89d14bbd6ea20e1ef785adcfd27d067009f3d (patch)
treeae5989e1dac23283f78a558912ae94cbca4ec600 /openbsd-compat/setenv.c
parent9b59ada7ca95a7ab42c49ae7b7cd6ff713b1bea0 (diff)
downloadopenssh-git-b8c89d14bbd6ea20e1ef785adcfd27d067009f3d.tar.gz
- (dtucker) [openbsd-compat/getenv.c] Merge changes for __findenv from
OpenBSD getenv.c revs 1.4 - 1.8 (ANSIfication of arguments, removal of "register").
Diffstat (limited to 'openbsd-compat/setenv.c')
-rw-r--r--openbsd-compat/setenv.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/openbsd-compat/setenv.c b/openbsd-compat/setenv.c
index c3a86c65..9f746ded 100644
--- a/openbsd-compat/setenv.c
+++ b/openbsd-compat/setenv.c
@@ -41,6 +41,8 @@ static char *rcsid = "$OpenBSD: setenv.c,v 1.6 2003/06/02 20:18:38 millert Exp $
char *__findenv(const char *name, int *offset);
+/* OpenSSH Portable: __findenv is from getenv.c rev 1.8 */
+
/*
* __findenv --
* Returns pointer to value associated with name, if any, else NULL.
@@ -51,14 +53,12 @@ char *__findenv(const char *name, int *offset);
* This routine *should* be a static; don't use it.
*/
char *
-__findenv(name, offset)
- register const char *name;
- int *offset;
+__findenv(const char *name, int *offset)
{
extern char **environ;
- register int len, i;
- register const char *np;
- register char **p, *cp;
+ int len, i;
+ const char *np;
+ char **p, *cp;
if (name == NULL || environ == NULL)
return (NULL);