Merge branch 'master' into next

* master:
  i9e: Constify completer arrays.
  Prefer __func__ to __FUNCTION__.
  imdct: Kill fftsample_t typedef.
  Doxgen: Do not omit brief descriptions.
  fd: Modify xwrite() and write_all() to take void * buffer argument.

# Conflicts:
#	interactive.h

diff --cc audioc.c
Simple merge

diff --cc client.c
Simple merge

diff --cc interactive.c
Simple merge

diff --cc interactive.h
index 95d1956006e7bafe5f440cd9b928ba140c2826ea,015d8a9275ac3c9ff972c539c8cf154993b70abd..86262e9cf0c416d0c56fe2169b728c2fba3d1c4e
--- 1/interactive.h
--- 2/interactive.h
+++ b/interactive.h
@@@ -85,15 -85,12 +85,15 @@@ void i9e_close(void)
  void i9e_signal_dispatch(int sig_num);
  __printf_2_3 void i9e_log(int ll, const char* fmt,...);
  int i9e_poll(struct pollfd *fds, nfds_t nfds, int timeout);
 -int i9e_extract_completions(const char *word, char **string_list,
 +int i9e_extract_completions(const char *word, char * const *string_list,
                char ***result);
- char **i9e_complete_commands(const char *word, struct i9e_completer *completers);
+ char **i9e_complete_commands(const char *word, const struct i9e_completer *completers);
 -void i9e_complete_option(char **opts, struct i9e_completion_info *ci,
 -              struct i9e_completion_result *cr);
 +void i9e_complete_option(char * const *opts,
 +              struct i9e_completion_info *ci, struct i9e_completion_result *cr);
 +unsigned i9e_get_nonopt_argnum(char * const *opts,
 +              struct i9e_completion_info *ci);
 +int i9e_cword_is_option_arg(char * const *opts, struct i9e_completion_info *ci);
- int i9e_print_completions(struct i9e_completer *completers);
+ int i9e_print_completions(const struct i9e_completer *completers);
  int i9e_get_error(void);
  void i9e_ll_completer(struct i9e_completion_info *ci,
                struct i9e_completion_result *cr);

diff --cc play.c
Simple merge