From beac8bdd9be41c0bc17d85429ca74b4f6aa99a3e Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <calcurse@cryptocrack.de>
Date: Wed, 17 Jul 2013 09:56:56 +0200
Subject: Rename io_file_exist{,s}()
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
---
src/calcurse.c | 6 +++---
src/calcurse.h | 2 +-
src/dmon.c | 4 ++--
src/io.c | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/calcurse.c b/src/calcurse.c
index 00181b7..2588721 100644
--- a/src/calcurse.c
+++ b/src/calcurse.c
@@ -507,7 +507,7 @@ static inline void key_generic_cmd(void)
topic_res = "intro";
snprintf(path, BUFSIZ, DOCDIR "/%s.txt", topic_res);
- if (!io_file_exist(path) && keys_str2int(topic_res) > 0 &&
+ if (!io_file_exists(path) && keys_str2int(topic_res) > 0 &&
keys_get_action(keys_str2int(topic_res)) > 0) {
int ch = keys_str2int(topic_res);
enum key action = keys_get_action(ch);
@@ -515,7 +515,7 @@ static inline void key_generic_cmd(void)
snprintf(path, BUFSIZ, DOCDIR "/%s.txt", topic_res);
}
- if (!io_file_exist(path)) {
+ if (!io_file_exists(path)) {
if (!strcmp(topic_res, "generic-credits"))
topic_res = "credits";
else if (!strcmp(topic_res, "generic-help"))
@@ -598,7 +598,7 @@ static inline void key_generic_cmd(void)
}
- if (io_file_exist(path)) {
+ if (io_file_exists(path)) {
wins_launch_external(path, conf.pager);
} else {
char error_msg[BUFSIZ];
diff --git a/src/calcurse.h b/src/calcurse.h
index c595cdb..a433361 100644
--- a/src/calcurse.h
+++ b/src/calcurse.h
@@ -754,7 +754,7 @@ void io_load_app(void);
void io_load_todo(void);
void io_load_keys(const char *);
int io_check_dir(const char *);
-unsigned io_file_exist(const char *);
+unsigned io_file_exists(const char *);
int io_check_file(const char *);
int io_check_data_files(void);
void io_startup_screen(int);
diff --git a/src/dmon.c b/src/dmon.c
index d1ef1cd..5653073 100644
--- a/src/dmon.c
+++ b/src/dmon.c
@@ -152,12 +152,12 @@ void dmon_start(int parent_exit_status)
if (!io_dump_pid(path_dpid))
DMON_ABRT(_("Could not set lock file\n"));
- if (!io_file_exist(path_conf))
+ if (!io_file_exists(path_conf))
DMON_ABRT(_("Could not access \"%s\": %s\n"), path_conf,
strerror(errno));
config_load();
- if (!io_file_exist(path_apts))
+ if (!io_file_exists(path_apts))
DMON_ABRT(_("Could not access \"%s\": %s\n"), path_apts,
strerror(errno));
apoint_llist_init();
diff --git a/src/io.c b/src/io.c
index 7448227..737be12 100644
--- a/src/io.c
+++ b/src/io.c
@@ -872,7 +872,7 @@ int io_check_dir(const char *dir)
}
}
-unsigned io_file_exist(const char *file)
+unsigned io_file_exists(const char *file)
{
FILE *fd;
@@ -890,7 +890,7 @@ int io_check_file(const char *file)
return -1;
errno = 0;
- if (io_file_exist(file)) {
+ if (io_file_exists(file)) {
return 1;
} else {
FILE *fd;
--
cgit v1.2.3-70-g09d2