diff options
| author | otto@openbsd.org <otto@openbsd.org> | 2019-06-06 07:13:13 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-06-07 16:25:42 +0200 |
| commit | 0323d9b619d512f80c57575b810a05791891f657 (patch) | |
| tree | 6bde14513c6fe9ff37d069325ee6baac112b6b60 /xmalloc.c | |
| parent | upstream: fix ssh-keysign fd handling problem introduced in r1.304 (diff) | |
| download | openssh-0323d9b619d512f80c57575b810a05791891f657.tar.xz openssh-0323d9b619d512f80c57575b810a05791891f657.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | xmalloc.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -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) |