(abmon): Remove spaces.

1998-11-12  Ulrich Drepper  <drepper@cygnus.com>

	* locales/el_GR (abmon): Remove spaces at end of strings.

elf/dynamic-link.h

@@ -81,9 +81,9 @@ elf_get_dynamic_info (ElfW(Dyn) *dyn,
    not happen we do something more optimal.  */
 
 #ifdef ELF_MACHINE_PLTREL_OVERLAP
-#define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, lazy) \
+#define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy) \
   do {									      \
-    struct { ElfW(Addr) start, size;  int lazy; } ranges[3];		      \
+    struct { ElfW(Addr) start, size; int lazy; } ranges[3];		      \
     int ranges_index;							      \
 									      \
     ranges[0].lazy = ranges[2].lazy = 0;				      \
@@ -96,7 +96,7 @@ elf_get_dynamic_info (ElfW(Dyn) *dyn,
 	ranges[0].size = (map)->l_info[DT_##RELOC##SZ]->d_un.d_val;	      \
       }									      \
 									      \
-     if ((lazy)								      \
+     if ((do_lazy)							      \
 	&& (map)->l_info[DT_PLTREL]					      \
 	&& (map)->l_info[DT_PLTREL]->d_un.d_val == DT_##RELOC)		      \
       {									      \
@@ -114,9 +114,9 @@ elf_get_dynamic_info (ElfW(Dyn) *dyn,
 			      ranges[ranges_index].lazy);		      \
   } while (0)
 #else
-#define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, lazy) \
+#define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy) \
   do {									      \
-    struct { ElfW(Addr) start, size;  int lazy; } ranges[2];		      \
+    struct { ElfW(Addr) start, size; int lazy; } ranges[2];		      \
     int ranges_index;							      \
     ranges[0].lazy = 0;							      \
     ranges[0].size = ranges[1].size = 0;				      \
@@ -132,15 +132,15 @@ elf_get_dynamic_info (ElfW(Dyn) *dyn,
       {									      \
 	ElfW(Addr) start = (map)->l_info[DT_JMPREL]->d_un.d_ptr;	      \
 									      \
-	if (lazy							      \
+	if ((do_lazy)							      \
 	    /* This test does not only detect whether the relocation	      \
 	       sections are in the right order, it also checks whether	      \
 	       there is a DT_REL/DT_RELA section.  */			      \
 	    || ranges[0].start + ranges[0].size != start)		      \
 	  {								      \
 	    ranges[1].start = start;					      \
 	    ranges[1].size = (map)->l_info[DT_PLTRELSZ]->d_un.d_val;	      \
-	    ranges[1].lazy = lazy;					      \
+	    ranges[1].lazy = (do_lazy);					      \
 	  }								      \
 	else								      \
 	  /* Combine processing the sections.  */			      \

include/protocols/routed.h

@@ -1 +1 @@
-#include <protocols/routed.h>
+#include <inet/protocols/routed.h>

include/protocols/rwhod.h

@@ -1 +1 @@
-#include <protocols/rwhod.h>
+#include <inet/protocols/rwhod.h>

include/protocols/talkd.h

@@ -1 +1 @@
-#include <protocols/talkd.h>
+#include <inet/protocols/talkd.h>

include/protocols/timed.h

@@ -1 +1 @@
-#include <protocols/timed.h>
+#include <inet/protocols/timed.h>

inet/netinet/in.h

@@ -41,14 +41,20 @@ enum
     IPPROTO_PUP = 12,	   /* PUP protocol.  */
     IPPROTO_UDP = 17,	   /* User Datagram Protocol.  */
     IPPROTO_IDP = 22,	   /* XNS IDP protocol.  */
+    IPPROTO_TP = 29,	   /* SO Transport Protocol Class 4.  */
     IPPROTO_IPV6 = 41,     /* IPv6 header.  */
     IPPROTO_ROUTING = 43,  /* IPv6 routing header.  */
     IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header.  */
+    IPPROTO_RSVP = 46,	   /* Reservation Protocol.  */
+    IPPROTO_GRE = 47,	   /* General Routing Encapsulation.  */
     IPPROTO_ESP = 50,      /* encapsulating security payload.  */
     IPPROTO_AH = 51,       /* authentication header.  */
     IPPROTO_ICMPV6 = 58,   /* ICMPv6.  */
     IPPROTO_NONE = 59,     /* IPv6 no next header.  */
     IPPROTO_DSTOPTS = 60,  /* IPv6 destination options.  */
+    IPPROTO_MTP = 92,	   /* Multicast Transport Protocol.  */
+    IPPROTO_ENCAP = 98,	   /* Encapsulation Header.  */
+    IPPROTO_PIM = 103,	   /* Protocol Independent Multicast.  */
     IPPROTO_RAW = 255,	   /* Raw IP packets.  */
     IPPROTO_MAX
   };

libio/Makefile

@@ -21,7 +21,7 @@
 #
 subdir	:= libio
 
-headers	:= stdio.h libio.h _G_config.h
+headers	:= stdio.h libio.h _G_config.h bits/stdio.h
 
 routines	:=							      \
 	filedoalloc iofclose iofdopen iofflush iofgetpos iofgets iofopen      \

libio/bits/stdio.h

@@ -0,0 +1,160 @@
+/* Optimizing macros and inline functions for stdio functions.
+   Copyright (C) 198 Free Software Foundation, Inc.
+
+   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
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef _STDIO_H
+# error "Never include <bits/stdio.h> directly; use <stdio.h> instead."
+#endif
+
+#ifdef __cplusplus
+# define __STDIO_INLINE inline
+#else
+# define __STDIO_INLINE extern __inline
+#endif
+
+
+#ifdef __USE_EXTERN_INLINES
+/* Write formatted output to stdout from argument list ARG.  */
+__STDIO_INLINE int
+vprintf (__const char *__restrict __fmt, _G_va_list __arg) __THROW
+{
+  return vfprintf (stdout, __fmt, __arg);
+}
+
+/* Read a character from stdin.  */
+__STDIO_INLINE int
+getchar (void) __THROW
+{
+  return _IO_getc (stdin);
+}
+
+
+# if defined __USE_POSIX || defined __USE_MISC
+/* This is defined in POSIX.1:1996.  */
+__STDIO_INLINE int
+getc_unlocked (FILE *__fp) __THROW
+{
+  return _IO_getc_unlocked (__fp);
+}
+
+/* This is defined in POSIX.1:1996.  */
+__STDIO_INLINE int
+getchar_unlocked (void) __THROW
+{
+  return _IO_getc_unlocked (stdin);
+}
+# endif	/* POSIX || misc */
+
+
+/* Write a character to stdout.  */
+__STDIO_INLINE int
+putchar (int __c) __THROW
+{
+  return _IO_putc (__c, stdout);
+}
+
+
+# ifdef __USE_MISC
+/* Faster version when locking is not necessary.  */
+__STDIO_INLINE int
+fputc_unlocked (int __c, FILE *__stream) __THROW
+{
+  return _IO_putc_unlocked (__c, __stream);
+}
+# endif /* misc */
+
+
+# if defined __USE_POSIX || defined __USE_MISC
+/* This is defined in POSIX.1:1996.  */
+__STDIO_INLINE int
+putc_unlocked (int __c, FILE *__stream) __THROW
+{
+  return _IO_putc_unlocked (__c, __stream);
+}
+
+/* This is defined in POSIX.1:1996.  */
+__STDIO_INLINE int
+putchar_unlocked (int __c) __THROW
+{
+  return _IO_putc_unlocked (__c, stdout);
+}
+# endif	/* POSIX || misc */
+
+
+# ifdef	__USE_GNU
+/* Like `getdelim', but reads up to a newline.  */
+__STDIO_INLINE _IO_ssize_t
+getline (char **__lineptr, size_t *__n, FILE *__stream) __THROW
+{
+  return __getdelim (__lineptr, __n, '\n', __stream);
+}
+# endif /* GNU */
+
+
+# ifdef __USE_MISC
+/* Faster versions when locking is not required.  */
+__STDIO_INLINE int
+feof_unlocked (FILE *__stream) __THROW
+{
+  return _IO_feof_unlocked (__stream);
+}
+
+/* Faster versions when locking is not required.  */
+__STDIO_INLINE int
+ferror_unlocked (FILE *__stream) __THROW
+{
+  return _IO_ferror_unlocked (__stream);
+}
+# endif /* misc */
+
+#endif /* Use extern inlines.  */
+
+
+#if defined __USE_MISC && defined __GNUC__ && defined __OPTIMIZE__
+/* Perform some simple optimizations.  */
+# define fread_unlocked(ptr, size, n, stream) \
+  (__extension__ ((__builtin_constant_p (size) && __builtin_constant_p (n)    \
+		   && (size_t) ((size) * (n)) <= 8)			      \
+		  ? ({ char *__ptr = (char *) (ptr);			      \
+		       FILE *__stream = (stream);			      \
+		       int __c;						      \
+		       size_t __cnt = (size) * (n);			      \
+		       while (__cnt-- > 0)				      \
+			 {						      \
+			   __c = _IO_getc_unlocked (__stream);		      \
+			   if (__c == EOF)				      \
+			     break;					      \
+			   *__ptr++ = __c;				      \
+			 }						      \
+		       ((size_t) ((size) * (n)) - __cnt) / (size); })	      \
+		  : fread_unlocked (ptr, size, n, stream)))
+
+# define fwrite_unlocked(ptr, size, n, stream) \
+  (__extension__ ((__builtin_constant_p (size) && __builtin_constant_p (n)    \
+		   && (size_t) ((size) * (n)) <= 8)			      \
+		  ? ({ const char *__ptr = (const char *) (ptr);	      \
+		       FILE *__stream = (stream);			      \
+		       size_t __cnt = (size) * (n);			      \
+		       while (__cnt-- > 0)				      \
+			 if (_IO_putc_unlocked (*__ptr++, __stream) == EOF)   \
+			   break;					      \
+		       ((size_t) ((size) * (n)) - __cnt) / (size); })	      \
+		  : fwrite_unlocked (ptr, size, n, stream)))
+#endif
+
+/* Define helper macro.  */
+#undef __STDIO_INLINE

libio/iofread.c

@@ -32,7 +32,7 @@ _IO_fread (buf, size, count, fp)
      _IO_size_t count;
      _IO_FILE *fp;
 {
-  _IO_size_t bytes_requested = size*count;
+  _IO_size_t bytes_requested = size * count;
   _IO_size_t bytes_read;
   CHECK_FILE (fp, 0);
   if (bytes_requested == 0)

libio/iofread_u.c

@@ -26,14 +26,16 @@
 #include "libioP.h"
 #include <stdio.h>
 
+#undef fread_unlocked
+
 _IO_size_t
 fread_unlocked (buf, size, count, fp)
      void *buf;
      _IO_size_t size;
      _IO_size_t count;
      _IO_FILE *fp;
 {
-  _IO_size_t bytes_requested = size*count;
+  _IO_size_t bytes_requested = size * count;
   _IO_size_t bytes_read;
   CHECK_FILE (fp, 0);
   if (bytes_requested == 0)

libio/iofwrite_u.c

@@ -26,6 +26,8 @@
 #include "libioP.h"
 #include <stdio.h>
 
+#undef fwrite_unlocked
+
 _IO_size_t
 fwrite_unlocked (buf, size, count, fp)
      const void *buf;