From 0323d9b619d512f80c57575b810a05791891f657 Mon Sep 17 00:00:00 2001
From: "otto@openbsd.org" <otto@openbsd.org>
Date: Thu, 6 Jun 2019 05:13:13 +0000
Subject: upstream: 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@

OpenBSD-Commit-ID: 154f4e3e174f614b09f792d4d06575e08de58a6b
---
 xmalloc.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'xmalloc.c')

diff --git a/xmalloc.c b/xmalloc.c
index 5cc0310a..be26510c 100644
--- a/xmalloc.c
+++ b/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
@@ -26,15 +26,9 @@
 #include "xmalloc.h"
 #include "log.h"
 
-void
-ssh_malloc_init(void)
-{
 #if defined(__OpenBSD__)
-	extern char *malloc_options;
-
-	malloc_options = "S";
++char *malloc_options = "S";
 #endif /* __OpenBSD__ */
-}
 
 void *
 xmalloc(size_t size)
-- 
cgit v1.2.1