OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove use of INTUSE/INTDEF in misc.

This commit is contained in:
Marek Polacek 2012-05-31 13:10:02 +02:00
parent 1c58d5dceb
commit 3091725976
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2012-05-31 Marek Polacek <polacek@redhat.com>
[BZ #14132]
* 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.
2012-05-30 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/sparc32/soft-fp/q_util.c

15
include/mntent.h
View File

@ -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)
#endif
libc_hidden_proto (__setmntent)
libc_hidden_proto (__getmntent_r)
libc_hidden_proto (__endmntent)
#endif

9
misc/mntent_r.c
View File

@ -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 char *mode)
return result;
}
INTDEF(__setmntent)
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 */
}
INTDEF(__endmntent)
libc_hidden_def (__endmntent)
weak_alias (__endmntent, endmntent)
@ -178,7 +177,7 @@ __getmntent_r (FILE *stream, struct mntent *mp, char *buffer, int bufsiz)
return mp;
}
INTDEF(__getmntent_r)
libc_hidden_def (__getmntent_r)
weak_alias (__getmntent_r, getmntent_r)