Fix sunrpc/xcrypt.c for GCC 4.0

Fix sunrpc/xcrypt.c for GCC 4.0

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 1393 bytes --]


Ok to commit the appended patch to fix xcrypt with GCC 4.0?  This is
similar to a patch by Alexandre for getnetgrent_r.

Andreas

2004-12-19  Andreas Jaeger  <aj@suse.de>

	[BZ #573]
	* sunrpc/xcrypt.c (passwd2des_internal): Make it hidden instead of
	internal linkage.

============================================================
Index: sunrpc/xcrypt.c
--- sunrpc/xcrypt.c	17 Sep 2002 10:58:00 -0000	1.7
+++ sunrpc/xcrypt.c	19 Dec 2004 15:13:10 -0000
@@ -69,13 +69,15 @@ static char hexval (char) internal_funct
 
 static void hex2bin (int, char *, char *) internal_function;
 static void bin2hex (int, unsigned char *, char *) internal_function;
-static void passwd2des_internal (char *pw, char *key);
-
+void passwd2des_internal (char *pw, char *key);
+#ifdef _LIBC
+libc_hidden_proto (passwd2des_internal)
+#endif
 
 /*
  * Turn password into DES key
  */
-static void
+void
 passwd2des_internal (char *pw, char *key)
 {
   int i;
@@ -88,6 +90,7 @@ passwd2des_internal (char *pw, char *key
 }
 
 #ifdef _LIBC
+libc_hidden_def (passwd2des_internal)
 strong_alias (passwd2des_internal, passwd2des)
 #else
 void passwd2des (char *pw, char *key)

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]

Re: Fix sunrpc/xcrypt.c for GCC 4.0

[Roland McGrath]

> 2004-12-19  Andreas Jaeger  <aj@suse.de>
> 
> 	[BZ #573]
> 	* sunrpc/xcrypt.c (passwd2des_internal): Make it hidden instead of
> 	internal linkage.

Yes, this is ok.

Re: Fix sunrpc/xcrypt.c for GCC 4.0

[H. J. Lu]

On Sun, Dec 19, 2004 at 08:15:13PM +0100, Andreas Jaeger wrote:
> 
> Ok to commit the appended patch to fix xcrypt with GCC 4.0?  This is
> similar to a patch by Alexandre for getnetgrent_r.
> 
> Andreas
> 
> 2004-12-19  Andreas Jaeger  <aj@suse.de>
> 
> 	[BZ #573]
> 	* sunrpc/xcrypt.c (passwd2des_internal): Make it hidden instead of
> 	internal linkage.
> 
> ============================================================
> Index: sunrpc/xcrypt.c
> --- sunrpc/xcrypt.c	17 Sep 2002 10:58:00 -0000	1.7
> +++ sunrpc/xcrypt.c	19 Dec 2004 15:13:10 -0000
> @@ -69,13 +69,15 @@ static char hexval (char) internal_funct
>  
>  static void hex2bin (int, char *, char *) internal_function;
>  static void bin2hex (int, unsigned char *, char *) internal_function;
> -static void passwd2des_internal (char *pw, char *key);
> -
> +void passwd2des_internal (char *pw, char *key);
> +#ifdef _LIBC
> +libc_hidden_proto (passwd2des_internal)
> +#endif
>  
>  /*
>   * Turn password into DES key
>   */
> -static void
> +void
>  passwd2des_internal (char *pw, char *key)
>  {
>    int i;
> @@ -88,6 +90,7 @@ passwd2des_internal (char *pw, char *key
>  }
>  
>  #ifdef _LIBC
> +libc_hidden_def (passwd2des_internal)
>  strong_alias (passwd2des_internal, passwd2des)
>  #else
>  void passwd2des (char *pw, char *key)

This patch will make gcc not to inline passwd2des_internal which
is the correct thing to do. Marking passwd2des_internal as "used"
will support inlining passwd2des_internal.


H.J.