This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Remove use of INTUSE/INTDEF in misc

Removal of INT{USE,DEF} in misc.  Tested x86_64.  Ok?

2012-05-30  Marek Polacek  <>

	* include/mntent.h (__setmntent_internal, __getmntent_r_internal
	__endmntent_internal): Remove declaration.
	(__setmntent, __endmntent, __getmntent_r) [NOT_IN_libc]: Remove macro.
	(__setmntent, __endmntent, __getmntent_r): Declare hidden proto.
	* misc/mntent_r.c: Replace INTDEF with libc_hidden_def.

--- libc/include/	2012-05-29 18:25:31.605054510 +0200
+++ libc/include/mntent.h	2012-05-30 15:35:17.289990361 +0200
@@ -3,24 +3,15 @@
 /* Now define the internal interfaces.  */
 extern FILE *__setmntent (const char *__file, const char *__mode);
-extern FILE *__setmntent_internal (const char *__file, const char *__mode);
 extern struct mntent *__getmntent_r (FILE *__stream,
 				     struct mntent *__result,
 				     char *__buffer, int __bufsize);
-extern struct mntent *__getmntent_r_internal (FILE *__stream,
-					      struct mntent *__result,
-					      char *__buffer, int __bufsize)
-     attribute_hidden;
 extern int __addmntent (FILE *__stream, const struct mntent *__mnt);
 extern int __endmntent (FILE *__stream);
-extern int __endmntent_internal (FILE *__stream) attribute_hidden;
 extern char *__hasmntopt (const struct mntent *__mnt, const char *__opt);
-#ifndef NOT_IN_libc
-# define __setmntent(file, mode) INTUSE(__setmntent) (file, mode)
-# define __endmntent(stream) INTUSE(__endmntent) (stream)
-# define __getmntent_r(stream, result, buffer, bufsize) \
-  INTUSE(__getmntent_r) (stream, result, buffer, bufsize)
+libc_hidden_proto (__setmntent)
+libc_hidden_proto (__getmntent_r)
+libc_hidden_proto (__endmntent)
--- libc/misc/	2012-05-30 15:33:35.777741450 +0200
+++ libc/misc/mntent_r.c	2012-05-30 15:34:31.735878659 +0200
@@ -1,6 +1,5 @@
 /* Utilities for reading/writing fstab, mtab, etc.
-   Copyright (C) 1995-2000, 2001, 2002, 2003, 2006, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    The GNU C Library is free software; you can redistribute it and/or
@@ -49,7 +48,7 @@ __setmntent (const char *file, const cha
   return result;
+libc_hidden_def (__setmntent)
 weak_alias (__setmntent, setmntent)
@@ -61,7 +60,7 @@ __endmntent (FILE *stream)
     fclose (stream);
   return 1;		/* SunOS 4.x says to always return 1 */
+libc_hidden_def (__endmntent)
 weak_alias (__endmntent, endmntent)
@@ -178,7 +177,7 @@ __getmntent_r (FILE *stream, struct mnte
   return mp;
+libc_hidden_def (__getmntent_r)
 weak_alias (__getmntent_r, getmntent_r)

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]