Applied, thanks.
On Tue, Nov 27, 2012 at 10:42:51PM +0000, Thomas Adam wrote:
> This sholud be "enum cmd_retval" since this is propagated via
> source_file_exec()
> ---
> cfg.c | 4 ++--
> tmux.h | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/cfg.c b/cfg.c
> index 74570e3..c5d6cbc 100644
> --- a/cfg.c
> +++ b/cfg.c
> @@ -73,7 +73,7 @@ cfg_add_cause(struct causelist *causes, const char *fmt,
> ...)
> * Load configuration file. Returns -1 for an error with a list of messages
> in
> * causes. Note that causes must be initialised by the caller!
> */
> -int
> +enum cmd_retval
> load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes)
> {
> FILE *f;
> @@ -86,7 +86,7 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct
> causelist *causes)
>
> if ((f = fopen(path, "rb")) == NULL) {
> cfg_add_cause(causes, "%s: %s", path, strerror(errno));
> - return (-1);
> + return (CMD_RETURN_ERROR);
> }
> n = 0;
>
> diff --git a/tmux.h b/tmux.h
> index 7de43a8..960d130 100644
> --- a/tmux.h
> +++ b/tmux.h
> @@ -1516,7 +1516,7 @@ extern int cfg_finished;
> extern int cfg_references;
> extern struct causelist cfg_causes;
> void printflike2 cfg_add_cause(struct causelist *, const char *, ...);
> -int load_cfg(const char *, struct cmd_ctx *, struct causelist *);
> +enum cmd_retval load_cfg(const char *, struct cmd_ctx *, struct
> causelist *);
> void show_cfg_causes(struct session *);
>
> /* format.c */
> --
> 1.7.11.4
>
>
> ------------------------------------------------------------------------------
> Keep yourself connected to Go Parallel:
> DESIGN Expert tips on starting your parallel project right.
> http://goparallel.sourceforge.net
> _______________________________________________
> tmux-users mailing list
> tmux-users@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/tmux-users
------------------------------------------------------------------------------
Keep yourself connected to Go Parallel:
DESIGN Expert tips on starting your parallel project right.
http://goparallel.sourceforge.net
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users
