提交 0f7ba8c2 编写于 作者: M Matthias Bolte

util: Make some conditional symbols unconditional

Add dummy bodies for HAVE_GETPWUID_R and HAVE_MNTENT_H dependent
functions for MinGW builds.
上级 3528d666
......@@ -2585,7 +2585,46 @@ int virGetGroupID(const char *name,
return 0;
}
#endif
#else /* HAVE_GETPWUID_R */
char *
virGetUserDirectory(uid_t uid ATTRIBUTE_UNUSED)
{
virUtilError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virGetUserDirectory is not avialable"));
return NULL;
}
char *
virGetUserName(uid_t uid ATTRIBUTE_UNUSED)
{
virUtilError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virGetUserName is not avialable"));
return NULL;
}
int virGetUserID(const char *name ATTRIBUTE_UNUSED,
uid_t *uid ATTRIBUTE_UNUSED)
{
virUtilError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virGetUserID is not avialable"));
return 0;
}
int virGetGroupID(const char *name ATTRIBUTE_UNUSED,
gid_t *gid ATTRIBUTE_UNUSED)
{
virUtilError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virGetGroupID is not avialable"));
return 0;
}
#endif /* HAVE_GETPWUID_R */
#ifdef HAVE_MNTENT_H
......@@ -2619,7 +2658,18 @@ cleanup:
return ret;
}
#endif
#else /* HAVE_MNTENT_H */
char *
virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
{
errno = ENOSYS;
return NULL;
}
#endif /* HAVE_MNTENT_H */
#ifndef PROXY
# if defined(UDEVADM) || defined(UDEVSETTLE)
......
......@@ -247,21 +247,17 @@ char *virGetHostname(virConnectPtr conn);
int virKillProcess(pid_t pid, int sig);
# ifdef HAVE_GETPWUID_R
char *virGetUserDirectory(uid_t uid);
char *virGetUserName(uid_t uid);
int virGetUserID(const char *name,
uid_t *uid) ATTRIBUTE_RETURN_CHECK;
int virGetGroupID(const char *name,
gid_t *gid) ATTRIBUTE_RETURN_CHECK;
# endif
int virRandomInitialize(unsigned int seed) ATTRIBUTE_RETURN_CHECK;
int virRandom(int max);
# ifdef HAVE_MNTENT_H
char *virFileFindMountPoint(const char *type);
# endif
void virFileWaitForDevices(void);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册