diff options
| author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/netsmb/smb_subr.c | |
| parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
| download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz | |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/netsmb/smb_subr.c')
| -rw-r--r-- | sys/netsmb/smb_subr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c index fe10a5c..3ecfd8f 100644 --- a/sys/netsmb/smb_subr.c +++ b/sys/netsmb/smb_subr.c @@ -90,7 +90,7 @@ smb_strdup(const char *s) int len; len = s ? strlen(s) + 1 : 1; - p = malloc(len, M_SMBSTR, M_WAITOK); + p = malloc(len, M_SMBSTR, 0); if (s) bcopy(s, p, len); else @@ -116,7 +116,7 @@ smb_strdupin(char *s, int maxlen) if (bt == 0) break; } - p = malloc(len, M_SMBSTR, M_WAITOK); + p = malloc(len, M_SMBSTR, 0); copyin(s, p, len); return p; } @@ -131,7 +131,7 @@ smb_memdupin(void *umem, int len) if (len > 8 * 1024) return NULL; - p = malloc(len, M_SMBSTR, M_WAITOK); + p = malloc(len, M_SMBSTR, 0); if (copyin(umem, p, len) == 0) return p; free(p, M_SMBSTR); @@ -148,7 +148,7 @@ smb_memdup(const void *umem, int len) if (len > 8 * 1024) return NULL; - p = malloc(len, M_SMBSTR, M_WAITOK); + p = malloc(len, M_SMBSTR, 0); if (p == NULL) return NULL; bcopy(umem, p, len); |
