Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapt to addition of malloc types

This commit is contained in:
jdolecek 2003-02-15 23:02:30 +00:00
parent 6aab0806c8
commit d5e1078f05
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/netsmb/smb_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: smb_subr.c,v 1.4 2003/02/01 06:23:48 thorpej Exp $ */
/* $NetBSD: smb_subr.c,v 1.5 2003/02/15 23:02:30 jdolecek Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@ -44,6 +44,7 @@
#include <sys/signal.h>
#include <sys/signalvar.h>
#include <sys/mbuf.h>
#include <sys/socketvar.h> /* for M_SONAME */
#include <netsmb/iconv.h>
@ -64,7 +65,7 @@
smb_unichar smb_unieol = 0;
static MALLOC_DEFINE(M_SMBSTR, "smbstr", "SMB strings");
MALLOC_DEFINE(M_SMPTEMP, "smbtemp", "Temp netsmb data");
MALLOC_DEFINE(M_SMBTEMP, "smbtemp", "Temp netsmb data");
void
smb_makescred(struct smb_cred *scred, struct proc *p, struct ucred *cred)
@ -178,7 +179,7 @@ smb_memfree(void *s)
}
void *
smb_zmalloc(unsigned long size, int type, int flags)
smb_zmalloc(unsigned long size, struct malloc_type *type, int flags)
{
return malloc(size, type, flags | M_ZERO);

4
sys/netsmb/smb_subr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: smb_subr.h,v 1.4 2003/02/01 06:23:48 thorpej Exp $ */
/* $NetBSD: smb_subr.h,v 1.5 2003/02/15 23:02:30 jdolecek Exp $ */
/*
* Copyright (c) 2000-2001, Boris Popov
@ -152,7 +152,7 @@ void *smb_memdupin(void *umem, int len);
void smb_strtouni(u_int16_t *dst, const char *src);
void smb_strfree(char *s);
void smb_memfree(void *s);
void *smb_zmalloc(unsigned long size, int type, int flags);
void *smb_zmalloc(unsigned long size, struct malloc_type *type, int flags);
int smb_encrypt(const u_char *apwd, u_char *C8, u_char *RN);
int smb_ntencrypt(const u_char *apwd, u_char *C8, u_char *RN);