oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

N_()ify

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23787 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-09-07 21:28:19 +00:00
parent c808db85c0
commit dddee52c0d
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/krb5/log.c
View File

@@ -121,13 +121,15 @@ krb5_initlog(krb5_context context,
{ {
krb5_log_facility *f = calloc(1, sizeof(*f)); krb5_log_facility *f = calloc(1, sizeof(*f));
if(f == NULL) { if(f == NULL) {
krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM,
N_("malloc: out of memory", ""));
return ENOMEM; return ENOMEM;
} }
f->program = strdup(program); f->program = strdup(program);
if(f->program == NULL){ if(f->program == NULL){
free(f); free(f);
krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM,
N_("malloc: out of memory", ""));
return ENOMEM; return ENOMEM;
} }
*fac = f; *fac = f;
@@ -145,7 +147,8 @@ krb5_addlog_func(krb5_context context,
{ {
struct facility *fp = log_realloc(fac); struct facility *fp = log_realloc(fac);
if(fp == NULL) { if(fp == NULL) {
krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM,
N_("malloc: out of memory", ""));
return ENOMEM; return ENOMEM;
} }
fp->min = min; fp->min = min;
@@ -187,7 +190,8 @@ open_syslog(krb5_context context,
int i; int i;
if(sd == NULL) { if(sd == NULL) {
krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM,
N_("malloc: out of memory", ""));
return ENOMEM; return ENOMEM;
} }
i = find_value(sev, syslogvals); i = find_value(sev, syslogvals);
@@ -242,7 +246,8 @@ open_file(krb5_context context, krb5_log_facility *fac, int min, int max,
{ {
struct file_data *fd = malloc(sizeof(*fd)); struct file_data *fd = malloc(sizeof(*fd));
if(fd == NULL) { if(fd == NULL) {
krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM,
N_("malloc: out of memory", ""));
return ENOMEM; return ENOMEM;
} }
fd->filename = filename; fd->filename = filename;
@@ -278,7 +283,7 @@ krb5_addlog_dest(krb5_context context, krb5_log_facility *f, const char *orig)
p = strchr(p, '/'); p = strchr(p, '/');
if(p == NULL) { if(p == NULL) {
krb5_set_error_message(context, HEIM_ERR_LOG_PARSE, krb5_set_error_message(context, HEIM_ERR_LOG_PARSE,
"failed to parse \"%s\"", orig); N_("failed to parse \"%s\"", ""), orig);
return HEIM_ERR_LOG_PARSE; return HEIM_ERR_LOG_PARSE;
} }
p++; p++;
@@ -293,7 +298,8 @@ krb5_addlog_dest(krb5_context context, krb5_log_facility *f, const char *orig)
int keep_open = 0; int keep_open = 0;
fn = strdup(p + 5); fn = strdup(p + 5);
if(fn == NULL) { if(fn == NULL) {
krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM,
N_("malloc: out of memory", ""));
return ENOMEM; return ENOMEM;
} }
if(p[4] == '='){ if(p[4] == '='){
@@ -301,7 +307,8 @@ krb5_addlog_dest(krb5_context context, krb5_log_facility *f, const char *orig)
O_TRUNC | O_APPEND, 0666); O_TRUNC | O_APPEND, 0666);
if(i < 0) { if(i < 0) {
ret = errno; ret = errno;
krb5_set_error_message(context, ret, "open(%s): %s", fn, krb5_set_error_message(context, ret,
N_("open(%s) logile: %s", ""), fn,
strerror(ret)); strerror(ret));
free(fn); free(fn);
return ret; return ret;
@@ -311,8 +318,9 @@ krb5_addlog_dest(krb5_context context, krb5_log_facility *f, const char *orig)
if(file == NULL){ if(file == NULL){
ret = errno; ret = errno;
close(i); close(i);
krb5_set_error_message(context, ret, "fdopen(%s): %s", fn, krb5_set_error_message(context, ret,
strerror(ret)); N_("fdopen(%s) logfile: %s", ""),
fn, strerror(ret));
free(fn); free(fn);
return ret; return ret;
} }
@@ -336,7 +344,8 @@ krb5_addlog_dest(krb5_context context, krb5_log_facility *f, const char *orig)
ret = open_syslog(context, f, min, max, severity, facility); ret = open_syslog(context, f, min, max, severity, facility);
}else{ }else{
ret = HEIM_ERR_LOG_PARSE; /* XXX */ ret = HEIM_ERR_LOG_PARSE; /* XXX */
krb5_set_error_message (context, ret, "unknown log type: %s", p); krb5_set_error_message (context, ret,
N_("unknown log type: %s", ""), p);
} }
return ret; return ret;
} }