mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-22 10:48:02 +00:00
localedef: add newlines to error messages
These won't be added elsewhere, so add a little bit of room to make these messages a little easier to read. The existing set is a mixed bag, there are somewhere in the ballpark of 45, 46 printfs to stderr and 19 of those had newlines. Reviewed by: yuripv Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D41693
This commit is contained in:
parent
3a7ffe206c
commit
3141e51d2e
|
@ -272,7 +272,7 @@ new_pri(void)
|
|||
maxpri = maxpri ? maxpri * 2 : 1024;
|
||||
prilist = realloc(prilist, sizeof (collpri_t) * maxpri);
|
||||
if (prilist == NULL) {
|
||||
fprintf(stderr,"out of memory");
|
||||
fprintf(stderr,"out of memory\n");
|
||||
return (-1);
|
||||
}
|
||||
for (i = numpri; i < maxpri; i++) {
|
||||
|
@ -333,7 +333,7 @@ resolve_pri(int32_t ref)
|
|||
if (pri->pass == pass) {
|
||||
/* report a line with the circular symbol */
|
||||
lineno = pri->lineno;
|
||||
fprintf(stderr,"circular reference in order list");
|
||||
fprintf(stderr,"circular reference in order list\n");
|
||||
return (-1);
|
||||
}
|
||||
if ((pri->pri < 0) || (pri->pri >= numpri)) {
|
||||
|
@ -494,7 +494,7 @@ define_collsym(char *name)
|
|||
collsym_t *sym;
|
||||
|
||||
if ((sym = calloc(1, sizeof(*sym))) == NULL) {
|
||||
fprintf(stderr,"out of memory");
|
||||
fprintf(stderr,"out of memory\n");
|
||||
return;
|
||||
}
|
||||
sym->name = name;
|
||||
|
@ -541,7 +541,7 @@ get_collundef(char *name)
|
|||
if ((ud = RB_FIND(collundefs, &collundefs, &srch)) == NULL) {
|
||||
if (((ud = calloc(1, sizeof(*ud))) == NULL) ||
|
||||
((ud->name = strdup(name)) == NULL)) {
|
||||
fprintf(stderr,"out of memory");
|
||||
fprintf(stderr,"out of memory\n");
|
||||
free(ud);
|
||||
return (NULL);
|
||||
}
|
||||
|
@ -565,7 +565,7 @@ get_collchar(wchar_t wc, int create)
|
|||
cc = RB_FIND(collchars, &collchars, &srch);
|
||||
if ((cc == NULL) && create) {
|
||||
if ((cc = calloc(1, sizeof(*cc))) == NULL) {
|
||||
fprintf(stderr, "out of memory");
|
||||
fprintf(stderr, "out of memory\n");
|
||||
return (NULL);
|
||||
}
|
||||
for (i = 0; i < NUM_WT; i++) {
|
||||
|
@ -687,7 +687,7 @@ start_order(int type)
|
|||
|
||||
/* this is used to protect ELLIPSIS processing */
|
||||
if ((lastorder == T_ELLIPSIS) && (type != T_CHAR)) {
|
||||
fprintf(stderr, "character value expected");
|
||||
fprintf(stderr, "character value expected\n");
|
||||
}
|
||||
|
||||
for (i = 0; i < COLL_WEIGHTS_MAX; i++) {
|
||||
|
@ -728,7 +728,7 @@ start_order_char(wchar_t wc)
|
|||
int i;
|
||||
|
||||
if (wc < ellipsis_start) {
|
||||
fprintf(stderr, "malformed range!");
|
||||
fprintf(stderr, "malformed range!\n");
|
||||
return;
|
||||
}
|
||||
while (ellipsis_start < wc) {
|
||||
|
@ -776,7 +776,7 @@ start_order_ellipsis(void)
|
|||
start_order(T_ELLIPSIS);
|
||||
|
||||
if (lastorder != T_CHAR) {
|
||||
fprintf(stderr, "illegal starting point for range");
|
||||
fprintf(stderr, "illegal starting point for range\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -792,12 +792,12 @@ define_collelem(char *name, wchar_t *wcs)
|
|||
int i;
|
||||
|
||||
if (wcslen(wcs) >= COLLATE_STR_LEN) {
|
||||
fprintf(stderr,"expanded collation element too long");
|
||||
fprintf(stderr,"expanded collation element too long\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if ((e = calloc(1, sizeof(*e))) == NULL) {
|
||||
fprintf(stderr, "out of memory");
|
||||
fprintf(stderr, "out of memory\n");
|
||||
return;
|
||||
}
|
||||
e->expand = wcs;
|
||||
|
@ -816,7 +816,7 @@ define_collelem(char *name, wchar_t *wcs)
|
|||
/* A character sequence can only reduce to one element. */
|
||||
if ((RB_FIND(elem_by_symbol, &elem_by_symbol, e) != NULL) ||
|
||||
(RB_FIND(elem_by_expand, &elem_by_expand, e) != NULL)) {
|
||||
fprintf(stderr, "duplicate collating element definition");
|
||||
fprintf(stderr, "duplicate collating element definition\n");
|
||||
free(e);
|
||||
return;
|
||||
}
|
||||
|
@ -932,7 +932,7 @@ add_order_subst(void)
|
|||
|
||||
if (s == NULL) {
|
||||
if ((s = calloc(1, sizeof(*s))) == NULL) {
|
||||
fprintf(stderr,"out of memory");
|
||||
fprintf(stderr,"out of memory\n");
|
||||
return;
|
||||
}
|
||||
s->key = new_pri();
|
||||
|
@ -976,7 +976,7 @@ static void
|
|||
add_subst_pri(int32_t ref)
|
||||
{
|
||||
if (curr_subst >= COLLATE_STR_LEN) {
|
||||
fprintf(stderr,"substitution string is too long");
|
||||
fprintf(stderr,"substitution string is too long\n");
|
||||
return;
|
||||
}
|
||||
subst_weights[curr_subst] = ref;
|
||||
|
@ -1040,7 +1040,7 @@ add_weight(int32_t ref, int pass)
|
|||
return;
|
||||
|
||||
if ((w = calloc(1, sizeof(*w))) == NULL) {
|
||||
fprintf(stderr, "out of memory");
|
||||
fprintf(stderr, "out of memory\n");
|
||||
return;
|
||||
}
|
||||
w->pri = srch.pri;
|
||||
|
@ -1214,7 +1214,7 @@ dump_collate(void)
|
|||
RB_COUNT(temp, substs, &substs[i], n);
|
||||
subst_count[i] = n;
|
||||
if ((st = calloc(n, sizeof(collate_subst_t))) == NULL) {
|
||||
fprintf(stderr, "out of memory");
|
||||
fprintf(stderr, "out of memory\n");
|
||||
return;
|
||||
}
|
||||
n = 0;
|
||||
|
@ -1245,7 +1245,7 @@ dump_collate(void)
|
|||
RB_NUMNODES(collelem_t, elem_by_expand, &elem_by_expand, chain_count);
|
||||
chain = calloc(chain_count, sizeof(collate_chain_t));
|
||||
if (chain == NULL) {
|
||||
fprintf(stderr, "out of memory");
|
||||
fprintf(stderr, "out of memory\n");
|
||||
return;
|
||||
}
|
||||
n = 0;
|
||||
|
@ -1265,7 +1265,7 @@ dump_collate(void)
|
|||
RB_NUMNODES(collchar_t, collchars, &collchars, n);
|
||||
large = calloc(n, sizeof(collate_large_t));
|
||||
if (large == NULL) {
|
||||
fprintf(stderr, "out of memory");
|
||||
fprintf(stderr, "out of memory\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -167,7 +167,7 @@ copy_category(char *src)
|
|||
}
|
||||
|
||||
if (rv != 0) {
|
||||
fprintf(stderr,"source locale data unavailable: %s", src);
|
||||
fprintf(stderr,"source locale data unavailable: %s\n", src);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -182,7 +182,7 @@ copy_category(char *src)
|
|||
(void) mkdir(dirname(category_file()), 0755);
|
||||
|
||||
if (link(srcpath, category_file()) != 0) {
|
||||
fprintf(stderr,"unable to copy locale data: %s",
|
||||
fprintf(stderr,"unable to copy locale data: %s\n",
|
||||
strerror(errno));
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -174,4 +174,4 @@ const char *get_wide_encoding(void);
|
|||
int max_wide(void);
|
||||
|
||||
//#define _(x) gettext(x)
|
||||
#define INTERR fprintf(stderr,"internal fault (%s:%d)", __FILE__, __LINE__)
|
||||
#define INTERR fprintf(stderr,"internal fault (%s:%d)\n", __FILE__, __LINE__)
|
||||
|
|
|
@ -93,7 +93,7 @@ add_monetary_num(int n)
|
|||
|
||||
(void) asprintf(&str, "%d", n);
|
||||
if (str == NULL) {
|
||||
fprintf(stderr, "out of memory");
|
||||
fprintf(stderr, "out of memory\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -167,7 +167,7 @@ add_monetary_group(int n)
|
|||
(void) asprintf(&s, "%s;%d", mon.mon_grouping, n);
|
||||
}
|
||||
if (s == NULL)
|
||||
fprintf(stderr, "out of memory");
|
||||
fprintf(stderr, "out of memory\n");
|
||||
|
||||
free((char *)mon.mon_grouping);
|
||||
mon.mon_grouping = s;
|
||||
|
|
|
@ -93,7 +93,7 @@ add_numeric_group(int n)
|
|||
(void) asprintf(&s, "%s;%d", numeric.grouping, n);
|
||||
}
|
||||
if (s == NULL)
|
||||
fprintf(stderr, "out of memory");
|
||||
fprintf(stderr, "out of memory\n");
|
||||
|
||||
free((char *)numeric.grouping);
|
||||
numeric.grouping = s;
|
||||
|
|
|
@ -104,7 +104,7 @@ add_list(const char *ptr[], char *str, int limit)
|
|||
return;
|
||||
}
|
||||
}
|
||||
fprintf(stderr,"too many list elements");
|
||||
fprintf(stderr,"too many list elements\n");
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -137,7 +137,7 @@ add_time_list(wchar_t *wcs)
|
|||
} else if (tm.pm == NULL) {
|
||||
tm.pm = str;
|
||||
} else {
|
||||
fprintf(stderr,"too many list elements");
|
||||
fprintf(stderr,"too many list elements\n");
|
||||
free(str);
|
||||
}
|
||||
break;
|
||||
|
@ -180,11 +180,11 @@ check_time_list(void)
|
|||
case T_ALT_DIGITS:
|
||||
return;
|
||||
default:
|
||||
fprintf(stderr,"unknown list");
|
||||
fprintf(stderr,"unknown list\n");
|
||||
break;
|
||||
}
|
||||
|
||||
fprintf(stderr,"too few items in list (%d)", last_kw);
|
||||
fprintf(stderr,"too few items in list (%d)\n", last_kw);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Reference in a new issue