From 95def09838fc61b37b6ea7cd5c234a465b4b129b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 25 Nov 1999 00:26:21 +1100 Subject: - Merged very large OpenBSD source code reformat - OpenBSD CVS updates - [channels.c cipher.c compat.c log-client.c scp.c serverloop.c] [ssh.h sshd.8 sshd.c] syslog changes: * Unified Logmessage for all auth-types, for success and for failed * Standard connections get only ONE line in the LOG when level==LOG: Auth-attempts are logged only, if authentication is: a) successfull or b) with passwd or c) we had more than AUTH_FAIL_LOG failues * many log() became verbose() * old behaviour with level=VERBOSE - [readconf.c readconf.h ssh.1 ssh.h sshconnect.c sshd.c] tranfer s/key challenge/response data in SSH_SMSG_AUTH_TIS_CHALLENGE messages. allows use of s/key in windows (ttssh, securecrt) and ssh-1.2.27 clients without 'ssh -v', ok: niels@ - [sshd.8] -V, for fallback to openssh in SSH2 compatibility mode - [sshd.c] fix sigchld race; cjc5@po.cwru.edu --- xmalloc.c | 73 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 35 insertions(+), 38 deletions(-) (limited to 'xmalloc.c') diff --git a/xmalloc.c b/xmalloc.c index b536f9d1..0f1c4305 100644 --- a/xmalloc.c +++ b/xmalloc.c @@ -1,56 +1,53 @@ /* - -xmalloc.c - -Author: Tatu Ylonen - -Copyright (c) 1995 Tatu Ylonen , Espoo, Finland - All rights reserved - -Created: Mon Mar 20 21:23:10 1995 ylo - -Versions of malloc and friends that check their results, and never return -failure (they call fatal if they encounter an error). - -*/ + * Author: Tatu Ylonen + * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland + * All rights reserved + * Created: Mon Mar 20 21:23:10 1995 ylo + * Versions of malloc and friends that check their results, and never return + * failure (they call fatal if they encounter an error). + */ #include "includes.h" -RCSID("$Id: xmalloc.c,v 1.1 1999/10/27 03:42:46 damien Exp $"); +RCSID("$Id: xmalloc.c,v 1.2 1999/11/24 13:26:23 damien Exp $"); #include "ssh.h" -void *xmalloc(size_t size) +void * +xmalloc(size_t size) { - void *ptr = malloc(size); - if (ptr == NULL) - fatal("xmalloc: out of memory (allocating %d bytes)", (int)size); - return ptr; + void *ptr = malloc(size); + if (ptr == NULL) + fatal("xmalloc: out of memory (allocating %d bytes)", (int) size); + return ptr; } -void *xrealloc(void *ptr, size_t new_size) +void * +xrealloc(void *ptr, size_t new_size) { - void *new_ptr; - - if (ptr == NULL) - fatal("xrealloc: NULL pointer given as argument"); - new_ptr = realloc(ptr, new_size); - if (new_ptr == NULL) - fatal("xrealloc: out of memory (new_size %d bytes)", (int)new_size); - return new_ptr; + void *new_ptr; + + if (ptr == NULL) + fatal("xrealloc: NULL pointer given as argument"); + new_ptr = realloc(ptr, new_size); + if (new_ptr == NULL) + fatal("xrealloc: out of memory (new_size %d bytes)", (int) new_size); + return new_ptr; } -void xfree(void *ptr) +void +xfree(void *ptr) { - if (ptr == NULL) - fatal("xfree: NULL pointer given as argument"); - free(ptr); + if (ptr == NULL) + fatal("xfree: NULL pointer given as argument"); + free(ptr); } -char *xstrdup(const char *str) +char * +xstrdup(const char *str) { - int len = strlen(str) + 1; + int len = strlen(str) + 1; - char *cp = xmalloc(len); - strlcpy(cp, str, len); - return cp; + char *cp = xmalloc(len); + strlcpy(cp, str, len); + return cp; } -- cgit v1.2.1