diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2012-11-27 22:59:34 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2012-11-27 22:59:34 +0000 |
commit | 8264e92b3797cda37cc6610ddc26138ba46e2832 (patch) | |
tree | b297c601f499c2e8e9f83ce7e105f27f67c9db07 | |
parent | 47c097cb51da9622180963af5391d142e7d4ade3 (diff) |
Fix return value of load_cfg, from Thomas Adam.
-rw-r--r-- | cfg.c | 4 | ||||
-rw-r--r-- | tmux.h | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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; @@ -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 */ |