mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

* configure.in (--with-fp): Note in help string that it's the default.

Browse Source 
* locale/programs/ld-ctype.c (struct locale_ctype_t): Use u_int32_t
	instead of unsigned int for map_collection_max and map_collection_act.

	* stdio-common/vfprintf.c [USE_IN_LIBIO] (flockfile, funlockfile):
	Macros removed; they are in <stdio.h>.
	* stdio-common/vfscanf.c: Likewise.

	`-include' to not complain before they exist.
This commit is contained in:
Roland McGrath 1996-05-13 22:01:00 +00:00
parent 95a108f0ba
commit a5b7bf0e62
6 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,5 +1,14 @@
Mon May 13 12:03:03 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* configure.in (--with-fp): Note in help string that it's the default.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Use u_int32_t
instead of unsigned int for map_collection_max and map_collection_act.
* stdio-common/vfprintf.c [USE_IN_LIBIO] (flockfile, funlockfile):
Macros removed; they are in <stdio.h>.
* stdio-common/vfscanf.c: Likewise.
* posix/glob.c [_AMIGA]: Don't include <pwd.h>.
(glob): Remove bogus & in call to globfree.
[_AMIGA]: Use AmigaDOS file name conventions.
@ -7,7 +16,7 @@ Mon May 13 12:03:03 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* time/Makefile (zonenames): Target removed.
(extra-objs): Remove it from here.
Include the z.* files directly instead of including zonenames; use
`-include' to not complain befre they exist.
`-include' to not complain before they exist.
* sysdeps/unix/Makefile: Find sysd-syscalls and s-proto.d with
$(common-objpfx) instead of $(objpfx).

2
configure.in
View File

@ -34,7 +34,7 @@ esac
dnl Arguments to specify presence of other packages/features.
AC_ARG_WITH(fp, dnl
--with-fp if using floating-point hardware,
--with-fp if using floating-point hardware [default=yes],
with_fp=$withval, with_fp=yes)
AC_ARG_WITH(gnu-binutils, dnl
--with-gnu-binutils if using GNU binutils (as and ld),

7
locale/programs/ld-ctype.c
View File

@ -88,8 +88,8 @@ struct locale_ctype_t
#define MAX_NR_CHARMAP 16
const char *mapnames[MAX_NR_CHARMAP];
u_int32_t *map_collection[MAX_NR_CHARMAP];
unsigned int map_collection_max[MAX_NR_CHARMAP];
unsigned int map_collection_act[MAX_NR_CHARMAP];
u_int32_t map_collection_max[MAX_NR_CHARMAP];
u_int32_t map_collection_act[MAX_NR_CHARMAP];
size_t map_collection_nr;
size_t last_map_idx;
unsigned int from_map_char;
@ -821,8 +821,7 @@ implementation limit: no more than %d character maps allowed"),
ctype->mapnames[cnt] = name;
if (max_chars == 0)
ctype->map_collection_max[cnt] = charset->mb_cur_max == 1 ? 256
: 512;
ctype->map_collection_max[cnt] = charset->mb_cur_max == 1 ? 256 : 512;
else
ctype->map_collection_max[cnt] = max_chars;

2
stdio-common/vfprintf.c
View File

@ -102,8 +102,6 @@ ssize_t __wprintf_pad __P ((FILE *, wchar_t pad, size_t n));
} \
} while (0)
# define UNBUFFERED_P(S) ((S)->_IO_file_flags & _IO_UNBUFFERED)
# define flockfile(S) _IO_flockfile (S)
# define funlockfile(S) _IO_funlockfile (S)
#else /* ! USE_IN_LIBIO */
/* This code is for use in the GNU C library. */
# include <stdio.h>

2
stdio-common/vfscanf.c
View File

@ -81,8 +81,6 @@ Cambridge, MA 02139, USA. */
return EOF; \
} \
} while (0)
# define flockfile(S) _IO_flockfile (S)
# define funlockfile(S) _IO_funlockfile (S)
#else
# define inchar() ((c = getc (s)), (void) ++read_in, c)
# define conv_error() do { \

18
string/envz.c
View File

@ -89,17 +89,17 @@ envz_remove (char **envz, size_t *envz_len, const char *name)
because when merging with another envz, the null entry can override an
entry in the other one. Null entries can be removed with envz_strip (). */
error_t
envz_add (char **envz, unsigned *envz_len, const char *name, const char *value)
envz_add (char **envz, size_t *envz_len, const char *name, const char *value)
{
envz_remove (envz, envz_len, name);
if (value)
/* Add the new value, if there is one. */
{
unsigned name_len = strlen (name);
unsigned value_len = strlen (value);
unsigned old_envz_len = *envz_len;
unsigned new_envz_len = old_envz_len + name_len + 1 + value_len + 1;
size_t name_len = strlen (name);
size_t value_len = strlen (value);
size_t old_envz_len = *envz_len;
size_t new_envz_len = old_envz_len + name_len + 1 + value_len + 1;
char *new_envz = realloc (*envz, new_envz_len);
if (new_envz)
@ -126,7 +126,7 @@ envz_add (char **envz, unsigned *envz_len, const char *name, const char *value)
OVERRIDE is true, then values in ENVZ2 will supercede those with the same
name in ENV, otherwise not. */
error_t
envz_merge (char **envz, unsigned *envz_len, const char *envz2,
envz_merge (char **envz, size_t *envz_len, const char *envz2,
size_t envz2_len, int override)
{
error_t err = 0;
@ -153,13 +153,13 @@ envz_merge (char **envz, unsigned *envz_len, const char *envz2,
/* Remove null entries. */
void
envz_strip (char **envz, unsigned *envz_len)
envz_strip (char **envz, size_t *envz_len)
{
char *entry = *envz;
unsigned left = *envz_len;
size_t left = *envz_len;
while (left)
{
unsigned entry_len = strlen (entry) + 1;
size_t entry_len = strlen (entry) + 1;
left -= entry_len;
if (! index (entry, SEP))
/* Null entry. */