summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/xmalloc.c
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2019-06-06 05:13:13 +0000
committerotto <otto@openbsd.org>2019-06-06 05:13:13 +0000
commiteedc3e89a813e007ee20d011314f613a59bb057c (patch)
tree91f31197e6edab09a4fae8689c84c9320e2be906 /usr.bin/ssh/xmalloc.c
parentConnectX-5 cards work too (diff)
downloadwireguard-openbsd-eedc3e89a813e007ee20d011314f613a59bb057c.tar.xz
wireguard-openbsd-eedc3e89a813e007ee20d011314f613a59bb057c.zip
Replace calls to ssh_malloc_init() by a static init of malloc_options.
Prepares for changes in the way malloc is initialized. ok guenther@ dtucker@
Diffstat (limited to 'usr.bin/ssh/xmalloc.c')
-rw-r--r--usr.bin/ssh/xmalloc.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/usr.bin/ssh/xmalloc.c b/usr.bin/ssh/xmalloc.c
index 83e30c690ef..efd458f6fff 100644
--- a/usr.bin/ssh/xmalloc.c
+++ b/usr.bin/ssh/xmalloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.c,v 1.34 2017/05/31 09:15:42 deraadt Exp $ */
+/* $OpenBSD: xmalloc.c,v 1.35 2019/06/06 05:13:13 otto Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -22,13 +22,7 @@
#include "xmalloc.h"
#include "log.h"
-void
-ssh_malloc_init(void)
-{
- extern char *malloc_options;
-
- malloc_options = "S";
-}
+char *malloc_options = "S";
void *
xmalloc(size_t size)