Browse Source

Wrap <unistd.h> so that internal calls go direct and they're all weak symbols

Delete unused 'fd' argument from internal function oldttyname()
OPENBSD_5_9
guenther 9 years ago
parent
commit
c9c56d2879
2 changed files with 6 additions and 2 deletions
  1. +3
    -1
      src/lib/libc/crypt/crypt.c
  2. +3
    -1
      src/lib/libc/crypt/cryptutil.c

+ 3
- 1
src/lib/libc/crypt/crypt.c View File

@ -1,7 +1,8 @@
/* $OpenBSD: crypt.c,v 1.30 2015/07/18 01:18:50 jeremy Exp $ */
/* $OpenBSD: crypt.c,v 1.31 2015/09/12 14:56:50 guenther Exp $ */
#include <errno.h> #include <errno.h>
#include <pwd.h> #include <pwd.h>
#include <unistd.h>
char * char *
crypt(const char *key, const char *setting) crypt(const char *key, const char *setting)
@ -18,3 +19,4 @@ crypt(const char *key, const char *setting)
errno = EINVAL; errno = EINVAL;
return (NULL); return (NULL);
} }
DEF_WEAK(crypt);

+ 3
- 1
src/lib/libc/crypt/cryptutil.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: cryptutil.c,v 1.10 2015/07/23 22:19:03 tedu Exp $ */
/* $OpenBSD: cryptutil.c,v 1.11 2015/09/12 14:56:50 guenther Exp $ */
/* /*
* Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
* *
@ -50,6 +50,7 @@ fail:
errno = EACCES; errno = EACCES;
return -1; return -1;
} }
DEF_WEAK(crypt_checkpass);
int int
crypt_newhash(const char *pass, const char *pref, char *hash, size_t hashlen) crypt_newhash(const char *pass, const char *pref, char *hash, size_t hashlen)
@ -95,3 +96,4 @@ crypt_newhash(const char *pass, const char *pref, char *hash, size_t hashlen)
err: err:
return rv; return rv;
} }
DEF_WEAK(crypt_newhash);

Loading…
Cancel
Save