diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-04-01 13:15:01 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-04-01 13:23:32 +0300 |
commit | ee08a14e8d73482297fa603938e0ba04475c092c (patch) | |
tree | 8a3ffbf93a3d4426bac7a5f57072c9a4b9581737 /libmu_scm/mu_util.c | |
parent | 36226fa2c08235807a34ca448788f6cdaa9cff02 (diff) | |
download | mailutils-ee08a14e8d73482297fa603938e0ba04475c092c.tar.gz mailutils-ee08a14e8d73482297fa603938e0ba04475c092c.tar.bz2 |
Remove the uses of deprecated Guile functions.
* am/guile.m4 (MU_CHECK_GUILE): Check for scm_t_off.
* include/mailutils/guile.h (mu_scm_makenum)
(mu_set_variable): Remove prototypes.
* libmu_scm/mu_address.c: Remove calls to deprecated Guile functions.
* libmu_scm/mu_body.c: Likewise.
* libmu_scm/mu_guile.c: Likewise.
* libmu_scm/mu_mailbox.c: Likewise.
* libmu_scm/mu_message.c: Likewise.
* libmu_scm/mu_mime.c: Likewise.
* libmu_scm/mu_util.c: Likewise.
* libmu_scm/mu_scm.c (mu_scm_makenum): Remove.
(mu_set_variable): Remove. Use scm_c_define instead.
Diffstat (limited to 'libmu_scm/mu_util.c')
-rw-r--r-- | libmu_scm/mu_util.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/libmu_scm/mu_util.c b/libmu_scm/mu_util.c index 2668a76da..22fedc586 100644 --- a/libmu_scm/mu_util.c +++ b/libmu_scm/mu_util.c @@ -56,20 +56,14 @@ SCM_DEFINE (scm_mu_getpwuid, "mu-getpwuid", 1, 0, 0, mu_scm_error (FUNC_NAME, errno, "Cannot get user credentials", SCM_BOOL_F); - ve[0] = scm_makfrom0str (entry->name); - ve[1] = scm_makfrom0str (entry->passwd); - ve[2] = scm_ulong2num ((unsigned long) entry->uid); - ve[3] = scm_ulong2num ((unsigned long) entry->gid); - ve[4] = scm_makfrom0str (entry->gecos); - if (!entry->dir) - ve[5] = scm_makfrom0str (""); - else - ve[5] = scm_makfrom0str (entry->dir); - if (!entry->shell) - ve[6] = scm_makfrom0str (""); - else - ve[6] = scm_makfrom0str (entry->shell); - ve[7] = scm_makfrom0str (entry->mailbox); + ve[0] = scm_from_locale_string (entry->name); + ve[1] = scm_from_locale_string (entry->passwd); + ve[2] = scm_from_ulong ((unsigned long) entry->uid); + ve[3] = scm_from_ulong ((unsigned long) entry->gid); + ve[4] = scm_from_locale_string (entry->gecos); + ve[5] = scm_from_locale_string (entry->dir ? entry->dir : ""); + ve[6] = scm_from_locale_string (entry->shell ? entry->shell : ""); + ve[7] = scm_from_locale_string (entry->mailbox); scm_array_handle_release (&handle); |