summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
81f3a79)
(parse_user_spec):
Don't translate a message until just before returning,
to avoid unnecessary translation.
# include <unistd.h>
#endif
# include <unistd.h>
#endif
#if ENABLE_NLS
# include <libintl.h>
# define _(Text) gettext (Text)
#if ENABLE_NLS
# include <libintl.h>
# define _(Text) gettext (Text)
parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
char **username_arg, char **groupname_arg)
{
parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
char **username_arg, char **groupname_arg)
{
- static const char *E_no_memory = N_("virtual memory exhausted");
static const char *E_invalid_user = N_("invalid user");
static const char *E_invalid_group = N_("invalid group");
static const char *E_bad_spec =
static const char *E_invalid_user = N_("invalid user");
static const char *E_invalid_group = N_("invalid group");
static const char *E_bad_spec =
- error_msg = _(E_invalid_user);
+ error_msg = E_invalid_user;
else
{
int use_login_group;
use_login_group = (separator != NULL && g == NULL);
if (use_login_group)
else
{
int use_login_group;
use_login_group = (separator != NULL && g == NULL);
if (use_login_group)
- error_msg = _(E_bad_spec);
+ error_msg = E_bad_spec;
else
{
/* FIXME: don't use atoi! */
else
{
/* FIXME: don't use atoi! */
if (grp == NULL)
{
if (!is_number (g))
if (grp == NULL)
{
if (!is_number (g))
- error_msg = _(E_invalid_group);
+ error_msg = E_invalid_group;
else
{
/* FIXME: don't use atoi! */
else
{
/* FIXME: don't use atoi! */
{
*username_arg = strdup (u);
if (*username_arg == NULL)
{
*username_arg = strdup (u);
if (*username_arg == NULL)
- error_msg = _(E_no_memory);
+ error_msg = xalloc_msg_memory_exhausted;
}
if (groupname != NULL && error_msg == NULL)
}
if (groupname != NULL && error_msg == NULL)
free (*username_arg);
*username_arg = NULL;
}
free (*username_arg);
*username_arg = NULL;
}
- error_msg = _(E_no_memory);
+ error_msg = xalloc_msg_memory_exhausted;