Skip to content

Commit

Permalink
include: make all functions __hidden
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Oct 14, 2021
1 parent 6aaa6ec commit 9ee4905
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 17 deletions.
4 changes: 3 additions & 1 deletion src/include/fexecve.h
Expand Up @@ -21,7 +21,9 @@
#ifndef _LXC_FEXECVE_H
#define _LXC_FEXECVE_H

#include "../lxc/compiler.h"
#include <stdio.h>
extern int fexecve(int fd, char *const argv[], char *const envp[]);

__hidden extern int fexecve(int fd, char *const argv[], char *const envp[]);

#endif /* _LXC_FEXECVE_H */
4 changes: 3 additions & 1 deletion src/include/getgrgid_r.h
Expand Up @@ -26,7 +26,9 @@
#include <sys/types.h>
#include <grp.h>

extern int getgrgid_r(gid_t gid, struct group *gr, char *buf, size_t size,
#include "../lxc/compiler.h"

__hidden extern int getgrgid_r(gid_t gid, struct group *gr, char *buf, size_t size,
struct group **res);

#endif /* _GETGRGID_R_H */
4 changes: 3 additions & 1 deletion src/include/getline.h
Expand Up @@ -32,6 +32,8 @@

#include <stdio.h>

extern ssize_t getline(char **outbuf, size_t *outsize, FILE *fp);
#include "../lxc/compiler.h"

__hidden extern ssize_t getline(char **outbuf, size_t *outsize, FILE *fp);

#endif
13 changes: 8 additions & 5 deletions src/include/lxcmntent.h
Expand Up @@ -21,6 +21,8 @@
#ifndef _LXCMNTENT_H
#define _LXCMNTENT_H

#include "../lxc/compiler.h"

#if IS_BIONIC
struct mntent
{
Expand All @@ -32,20 +34,21 @@ struct mntent
int mnt_passno;
};

extern struct mntent *getmntent (FILE *stream);
extern struct mntent *getmntent_r (FILE *stream, struct mntent *mp, char *buffer, int bufsiz);
__hidden extern struct mntent *getmntent(FILE *stream);
__hidden extern struct mntent *getmntent_r(FILE *stream, struct mntent *mp,
char *buffer, int bufsiz);
#endif

#if !defined(HAVE_SETMNTENT) || IS_BIONIC
FILE *setmntent (const char *file, const char *mode);
__hidden FILE *setmntent(const char *file, const char *mode);
#endif

#if !defined(HAVE_ENDMNTENT) || IS_BIONIC
int endmntent (FILE *stream);
__hidden int endmntent(FILE *stream);
#endif

#if !defined(HAVE_HASMNTOPT) || IS_BIONIC
extern char *hasmntopt (const struct mntent *mnt, const char *opt);
__hidden extern char *hasmntopt(const struct mntent *mnt, const char *opt);
#endif

#endif
4 changes: 2 additions & 2 deletions src/include/netns_ifaddrs.h
Expand Up @@ -12,8 +12,8 @@ extern "C" {
#include <stdbool.h>
#include <sys/socket.h>

#include "compiler.h"
#include "memory_utils.h"
#include "../lxc/compiler.h"
#include "../lxc/memory_utils.h"

struct netns_ifaddrs {
struct netns_ifaddrs *ifa_next;
Expand Down
7 changes: 5 additions & 2 deletions src/include/openpty.h
Expand Up @@ -6,12 +6,15 @@
#include <termios.h>
#include <sys/ioctl.h>

#include "../lxc/memory_utils.h"

/*
* Create pseudo tty ptx pty pair with @__name and set terminal
* attributes according to @__termp and @__winp and return handles for both
* ends in @__aptx and @__apts.
*/
extern int openpty(int *ptx, int *pty, char *name, const struct termios *termp,
const struct winsize *winp);
__hidden extern int openpty(int *ptx, int *pty, char *name,
const struct termios *termp,
const struct winsize *winp);

#endif
6 changes: 4 additions & 2 deletions src/include/prlimit.h
Expand Up @@ -32,10 +32,12 @@
#include <linux/resource.h>
#include <sys/types.h>

#include "../lxc/memory_utils.h"

#define RLIM_SAVED_CUR RLIM_INFINITY
#define RLIM_SAVED_MAX RLIM_INFINITY

int prlimit(pid_t, int, const struct rlimit*, struct rlimit*);
int prlimit64(pid_t, int, const struct rlimit64*, struct rlimit64*);
__hidden int prlimit(pid_t, int, const struct rlimit *, struct rlimit *);
__hidden int prlimit64(pid_t, int, const struct rlimit64 *, struct rlimit64 *);

#endif
2 changes: 1 addition & 1 deletion src/include/strchrnul.h
Expand Up @@ -20,6 +20,6 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */

#include "compiler.h"
#include "../lxc/compiler.h"

__hidden extern char *strchrnul(const char *s, int c_in);
3 changes: 2 additions & 1 deletion src/include/strlcat.h
Expand Up @@ -22,8 +22,9 @@
#ifndef _STRLCAT_H
#define _STRLCAT_H

#include "../lxc/compiler.h"
#include <stdio.h>

extern size_t strlcat(char *src, const char *append, size_t len);
__hidden extern size_t strlcat(char *src, const char *append, size_t len);

#endif
3 changes: 2 additions & 1 deletion src/include/strlcpy.h
Expand Up @@ -22,8 +22,9 @@
#ifndef _STRLCPY_H
#define _STRLCPY_H

#include "../lxc/compiler.h"
#include <stdio.h>

extern size_t strlcpy(char *, const char *, size_t);
__hidden extern size_t strlcpy(char *, const char *, size_t);

#endif

0 comments on commit 9ee4905

Please sign in to comment.