AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-13 06:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

(read_input_file): Remove messages correctly.

Browse Source
This commit is contained in:
Ulrich Drepper 2000-01-29 11:52:24 +00:00
parent 4443d1b2c7
commit a4bd557ebc
1 changed files with 38 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
catgets/gencat.c
View File

@ -1,6 +1,6 @@
/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. /* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. Contributed by Ulrich Drepper <drepper@redhat.com>, 1996.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as modify it under the terms of the GNU Library General Public License as
@ -32,6 +32,7 @@
#include <limits.h> #include <limits.h>
#include <nl_types.h> #include <nl_types.h>
#include <obstack.h> #include <obstack.h>
#include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -237,7 +238,7 @@ print_version (FILE *stream, struct argp_state *state)
Copyright (C) %s Free Software Foundation, Inc.\n\ Copyright (C) %s Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions. There is NO\n\ This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
"), "1999"); "), "2000");
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
} }
@ -492,13 +493,12 @@ this is the first definition"));
{ {
const char *ident = this_line; const char *ident = this_line;
int message_number; int message_number;
int any_space;
do do
++this_line; ++this_line;
while (this_line[0] != '\0' && !isspace (this_line[0])); while (this_line[0] != '\0' && !isspace (this_line[0]));
any_space = isspace (*this_line); if (this_line[0] != '\0')
*this_line++ = '\0'; /* Terminate the identifier. */ *this_line++ = '\0'; /* Terminate the identifier. */
/* Now we found the beginning of the message itself. */ /* Now we found the beginning of the message itself. */
@ -522,24 +522,12 @@ this is the first definition"));
} }
if (runp != NULL) if (runp != NULL)
{ {
if (any_space) /* Oh, oh. There is already a message with this
{ number in the message set. */
/* Oh, oh. There is already a message with this error_at_line (0, 0, fname, start_line,
number in the message set. */ gettext ("duplicated message number"));
error_at_line (0, 0, fname, start_line, error_at_line (0, 0, runp->fname, runp->line,
gettext ("duplicated message number")); gettext ("this is the first definition"));
error_at_line (0, 0, runp->fname, runp->line,
gettext ("this is the first definition"));
}
else
{
/* We have to remove this message. */
if (lastp != NULL)
lastp->next = runp->next;
else
current->current_set->messages = runp->next;
free (runp);
}
message_number = 0; message_number = 0;
} }
ident = NULL; /* We don't have a symbol. */ ident = NULL; /* We don't have a symbol. */
@ -564,24 +552,11 @@ this is the first definition"));
runp = runp->next; runp = runp->next;
if (runp != NULL) if (runp != NULL)
{ {
if (any_space) /* The name is already used. */
{ error_at_line (0, 0, fname, start_line, gettext ("\
/* The name is already used. */
error_at_line (0, 0, fname, start_line,
gettext ("\
duplicated message identifier")); duplicated message identifier"));
error_at_line (0, 0, runp->fname, runp->line, error_at_line (0, 0, runp->fname, runp->line,
gettext ("this is the first definition")); gettext ("this is the first definition"));
}
else
{
/* We have to remove this message. */
if (lastp != NULL)
lastp->next = runp->next;
else
current->current_set->messages = runp->next;
free (runp);
}
message_number = 0; message_number = 0;
} }
else else
@ -673,7 +648,7 @@ write_out (struct catalog *catalog, const char *output_name,
struct obstack string_pool; struct obstack string_pool;
const char *strings; const char *strings;
size_t strings_size; size_t strings_size;
u_int32_t *array1, *array2; uint32_t *array1, *array2;
size_t cnt; size_t cnt;
int fd; int fd;
@ -751,10 +726,10 @@ write_out (struct catalog *catalog, const char *output_name,
/* Allocate room for all needed arrays. */ /* Allocate room for all needed arrays. */
array1 = array1 =
(u_int32_t *) alloca (best_size * best_depth * sizeof (u_int32_t) * 3); (uint32_t *) alloca (best_size * best_depth * sizeof (uint32_t) * 3);
memset (array1, '\0', best_size * best_depth * sizeof (u_int32_t) * 3); memset (array1, '\0', best_size * best_depth * sizeof (uint32_t) * 3);
array2 array2
= (u_int32_t *) alloca (best_size * best_depth * sizeof (u_int32_t) * 3); = (uint32_t *) alloca (best_size * best_depth * sizeof (uint32_t) * 3);
obstack_init (&string_pool); obstack_init (&string_pool);
set_run = catalog->all_sets; set_run = catalog->all_sets;
@ -812,11 +787,11 @@ write_out (struct catalog *catalog, const char *output_name,
/* We always write out the little endian version of the index /* We always write out the little endian version of the index
arrays. */ arrays. */
#if __BYTE_ORDER == __LITTLE_ENDIAN #if __BYTE_ORDER == __LITTLE_ENDIAN
write (fd, array1, best_size * best_depth * sizeof (u_int32_t) * 3); write (fd, array1, best_size * best_depth * sizeof (uint32_t) * 3);
write (fd, array2, best_size * best_depth * sizeof (u_int32_t) * 3); write (fd, array2, best_size * best_depth * sizeof (uint32_t) * 3);
#elif __BYTE_ORDER == __BIG_ENDIAN #elif __BYTE_ORDER == __BIG_ENDIAN
write (fd, array2, best_size * best_depth * sizeof (u_int32_t) * 3); write (fd, array2, best_size * best_depth * sizeof (uint32_t) * 3);
write (fd, array1, best_size * best_depth * sizeof (u_int32_t) * 3); write (fd, array1, best_size * best_depth * sizeof (uint32_t) * 3);
#else #else
# error Cannot handle __BYTE_ORDER byte order # error Cannot handle __BYTE_ORDER byte order
#endif #endif
@ -1034,7 +1009,8 @@ read_old (struct catalog *catalog, const char *file_name)
/* OK, we have the catalog loaded. Now read all messages and merge /* OK, we have the catalog loaded. Now read all messages and merge
them. When set and message number clash for any message the new them. When set and message number clash for any message the new
one is used. */ one is used. If the new one is empty it indicates that the
message should be deleted. */
for (cnt = 0; cnt < old_cat_obj.plane_size * old_cat_obj.plane_depth; ++cnt) for (cnt = 0; cnt < old_cat_obj.plane_size * old_cat_obj.plane_depth; ++cnt)
{ {
struct message_list *message, *last; struct message_list *message, *last;
@ -1043,7 +1019,7 @@ read_old (struct catalog *catalog, const char *file_name)
/* No message in this slot. */ /* No message in this slot. */
continue; continue;
if (old_cat_obj.name_ptr[cnt * 3 + 0] - 1 != (u_int32_t) last_set) if (old_cat_obj.name_ptr[cnt * 3 + 0] - 1 != (uint32_t) last_set)
{ {
last_set = old_cat_obj.name_ptr[cnt * 3 + 0] - 1; last_set = old_cat_obj.name_ptr[cnt * 3 + 0] - 1;
set = find_set (catalog, old_cat_obj.name_ptr[cnt * 3 + 0] - 1); set = find_set (catalog, old_cat_obj.name_ptr[cnt * 3 + 0] - 1);
@ -1053,14 +1029,14 @@ read_old (struct catalog *catalog, const char *file_name)
message = set->messages; message = set->messages;
while (message != NULL) while (message != NULL)
{ {
if ((u_int32_t) message->number >= old_cat_obj.name_ptr[cnt * 3 + 1]) if ((uint32_t) message->number >= old_cat_obj.name_ptr[cnt * 3 + 1])
break; break;
last = message; last = message;
message = message->next; message = message->next;
} }
if (message == NULL if (message == NULL
|| (u_int32_t) message->number > old_cat_obj.name_ptr[cnt * 3 + 1]) || (uint32_t) message->number > old_cat_obj.name_ptr[cnt * 3 + 1])
{ {
/* We have found a message which is not yet in the catalog. /* We have found a message which is not yet in the catalog.
Insert it at the right position. */ Insert it at the right position. */
@ -1082,5 +1058,14 @@ read_old (struct catalog *catalog, const char *file_name)
++catalog->total_messages; ++catalog->total_messages;
} }
else if (*message->message == '\0')
{
/* The new empty message has overridden the old one thus
"deleting" it as required. Now remove the empty remains. */
if (last == NULL)
set->messages = message->next;
else
last->next = message->next;
}
} }
} }