diff options
| author | Alfred Perlstein <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | Alfred Perlstein <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | 44956c9863dc03344b03bdf6a83acf4e743f8e50 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/libkern | |
| parent | 1326e03f7f8018164ece91fc0a3f15f9c65ff64a (diff) | |
Notes
Diffstat (limited to 'sys/libkern')
| -rw-r--r-- | sys/libkern/iconv.c | 4 | ||||
| -rw-r--r-- | sys/libkern/iconv_xlat.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c index 8bc03c1e7a1f0..8352fcd1f8326 100644 --- a/sys/libkern/iconv.c +++ b/sys/libkern/iconv.c @@ -186,7 +186,7 @@ iconv_register_cspair(const char *to, const char *from, ucsfrom = strcmp(from, iconv_unicode_string) == 0; if (!ucsfrom) csize += strlen(from) + 1; - csp = malloc(csize, M_ICONV, M_WAITOK); + csp = malloc(csize, M_ICONV, 0); bzero(csp, csize); csp->cp_id = iconv_csid++; csp->cp_dcp = dcp; @@ -360,7 +360,7 @@ iconv_sysctl_add(SYSCTL_HANDLER_ARGS) if (error) return error; if (din.ia_datalen) { - csp->cp_data = malloc(din.ia_datalen, M_ICONVDATA, M_WAITOK); + csp->cp_data = malloc(din.ia_datalen, M_ICONVDATA, 0); error = copyin(din.ia_data, csp->cp_data, din.ia_datalen); if (error) goto bad; diff --git a/sys/libkern/iconv_xlat.c b/sys/libkern/iconv_xlat.c index 6dd2800a535f4..e355c6b421947 100644 --- a/sys/libkern/iconv_xlat.c +++ b/sys/libkern/iconv_xlat.c @@ -62,7 +62,7 @@ iconv_xlat_open(struct iconv_converter_class *dcp, { struct iconv_xlat *dp; - dp = (struct iconv_xlat *)kobj_create((struct kobj_class*)dcp, M_ICONV, M_WAITOK); + dp = (struct iconv_xlat *)kobj_create((struct kobj_class*)dcp, M_ICONV, 0); dp->d_table = csp->cp_data; dp->d_csp = csp; csp->cp_refcount++; |