From 8264e92b3797cda37cc6610ddc26138ba46e2832 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Tue, 27 Nov 2012 22:59:34 +0000
Subject: [PATCH] Fix return value of load_cfg, from Thomas Adam.

---
 cfg.c  | 4 ++--
 tmux.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cfg.c b/cfg.c
index 3da6ea4d..b64a4d6a 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 981d4f21..429f2d7f 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1520,7 +1520,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 */