|
 |
304803 |
autofs-5.1.0 - fix gcc5 complaints
|
|
|
304803 |
|
|
|
304803 |
From: Ian Kent <raven@themaw.net>
|
|
|
304803 |
|
|
|
304803 |
gcc5 is not happy with the way dump_core() and master_get_logopt()
|
|
|
304803 |
are declared inline, remove the inline and let the compiler decide.
|
|
|
304803 |
---
|
|
|
304803 |
CHANGELOG | 1 +
|
|
|
304803 |
daemon/spawn.c | 2 +-
|
|
|
304803 |
include/automount.h | 2 +-
|
|
|
304803 |
include/master.h | 2 +-
|
|
|
304803 |
lib/master.c | 2 +-
|
|
|
304803 |
5 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
304803 |
|
|
|
304803 |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
304803 |
+++ autofs-5.0.7/CHANGELOG
|
|
|
304803 |
@@ -192,6 +192,7 @@
|
|
|
304803 |
- fix handle_mounts() termination condition check.
|
|
|
304803 |
- fix config old name lookup.
|
|
|
304803 |
- fix error handling on ldap bind fail.
|
|
|
304803 |
+- fix gcc5 complaints.
|
|
|
304803 |
|
|
|
304803 |
25/07/2012 autofs-5.0.7
|
|
|
304803 |
=======================
|
|
|
304803 |
--- autofs-5.0.7.orig/daemon/spawn.c
|
|
|
304803 |
+++ autofs-5.0.7/daemon/spawn.c
|
|
|
304803 |
@@ -36,7 +36,7 @@ static pthread_mutex_t spawn_mutex = PTH
|
|
|
304803 |
|
|
|
304803 |
#define MTAB_LOCK_RETRIES 3
|
|
|
304803 |
|
|
|
304803 |
-inline void dump_core(void)
|
|
|
304803 |
+void dump_core(void)
|
|
|
304803 |
{
|
|
|
304803 |
sigset_t segv;
|
|
|
304803 |
|
|
|
304803 |
--- autofs-5.0.7.orig/include/automount.h
|
|
|
304803 |
+++ autofs-5.0.7/include/automount.h
|
|
|
304803 |
@@ -241,7 +241,7 @@ const char **copy_argv(int argc, const c
|
|
|
304803 |
int compare_argv(int argc1, const char **argv1, int argc2, const char **argv2);
|
|
|
304803 |
int free_argv(int argc, const char **argv);
|
|
|
304803 |
|
|
|
304803 |
-inline void dump_core(void);
|
|
|
304803 |
+void dump_core(void);
|
|
|
304803 |
int aquire_lock(void);
|
|
|
304803 |
void release_lock(void);
|
|
|
304803 |
int spawnl(unsigned logopt, const char *prog, ...);
|
|
|
304803 |
--- autofs-5.0.7.orig/include/master.h
|
|
|
304803 |
+++ autofs-5.0.7/include/master.h
|
|
|
304803 |
@@ -120,7 +120,7 @@ void master_notify_state_change(struct m
|
|
|
304803 |
int master_mount_mounts(struct master *, time_t, int);
|
|
|
304803 |
int dump_map(struct master *, const char *, const char *);
|
|
|
304803 |
int master_show_mounts(struct master *);
|
|
|
304803 |
-extern inline unsigned int master_get_logopt(void);
|
|
|
304803 |
+unsigned int master_get_logopt(void);
|
|
|
304803 |
int master_list_empty(struct master *);
|
|
|
304803 |
int master_done(struct master *);
|
|
|
304803 |
int master_kill(struct master *);
|
|
|
304803 |
--- autofs-5.0.7.orig/lib/master.c
|
|
|
304803 |
+++ autofs-5.0.7/lib/master.c
|
|
|
304803 |
@@ -1712,7 +1712,7 @@ int master_done(struct master *master)
|
|
|
304803 |
return res;
|
|
|
304803 |
}
|
|
|
304803 |
|
|
|
304803 |
-inline unsigned int master_get_logopt(void)
|
|
|
304803 |
+unsigned int master_get_logopt(void)
|
|
|
304803 |
{
|
|
|
304803 |
return master_list ? master_list->logopt : LOGOPT_NONE;
|
|
|
304803 |
}
|