summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorKevin Steves <stevesk@cvs.openbsd.org>2001-04-03 13:56:12 +0000
committerKevin Steves <stevesk@cvs.openbsd.org>2001-04-03 13:56:12 +0000
commitec3068ae7c6fc4c3dfa8ba58fda4c23ed911b445 (patch)
tree8ddcff69fd70fbc16fcf484ddb7bcfbb43563340 /usr.bin
parent4a65638e676c5958c06620e087afcd527de6e394 (diff)
free() -> xfree()
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/sftp-glob.c4
-rw-r--r--usr.bin/ssh/ssh-agent.c8
-rw-r--r--usr.bin/ssh/ssh-keygen.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/sftp-glob.c b/usr.bin/ssh/sftp-glob.c
index f3154231fe9..fec8a0af246 100644
--- a/usr.bin/ssh/sftp-glob.c
+++ b/usr.bin/ssh/sftp-glob.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sftp-glob.c,v 1.2 2001/03/16 08:16:18 djm Exp $");
+RCSID("$OpenBSD: sftp-glob.c,v 1.3 2001/04/03 13:56:11 stevesk Exp $");
#include <glob.h>
@@ -82,7 +82,7 @@ struct dirent *fudge_readdir(struct SFTP_OPENDIR *od)
void fudge_closedir(struct SFTP_OPENDIR *od)
{
free_sftp_dirents(od->dir);
- free(od);
+ xfree(od);
}
void attrib_to_stat(Attrib *a, struct stat *st)
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index 92edcb407b1..3d6016aea15 100644
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.53 2001/03/26 23:23:24 markus Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.54 2001/04/03 13:56:11 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -37,7 +37,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.53 2001/03/26 23:23:24 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.54 2001/04/03 13:56:11 stevesk Exp $");
#include <openssl/evp.h>
#include <openssl/md5.h>
@@ -559,9 +559,9 @@ prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl)
sz = howmany(n+1, NFDBITS) * sizeof(fd_mask);
if (*fdrp == NULL || n > *fdl) {
if (*fdrp)
- free(*fdrp);
+ xfree(*fdrp);
if (*fdwp)
- free(*fdwp);
+ xfree(*fdwp);
*fdrp = xmalloc(sz);
*fdwp = xmalloc(sz);
*fdl = n;
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 94d1f0a5b90..9a58a473eee 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.53 2001/03/26 23:23:24 markus Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.54 2001/04/03 13:56:11 stevesk Exp $");
#include <openssl/evp.h>
#include <openssl/pem.h>
@@ -252,7 +252,7 @@ do_convert_private_ssh2_from_blob(char *blob, int blen)
key_sign(key, &sig, &slen, data, sizeof data);
key_verify(key, sig, slen, data, sizeof data);
- free(sig);
+ xfree(sig);
}
#endif
return key;