mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-29 14:26:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of pwmt.org:zathura into develop

Browse source
This commit is contained in:
Moritz Lipp 2012-03-19 17:05:56 +01:00
commit 5b6a399256
4 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
document.c
View file

@ -209,7 +209,7 @@ zathura_document_open(zathura_t* zathura, const char* path, const char* password
return NULL; return NULL;
} }
if (file_exists(path) == false) { if (g_file_test(path, G_FILE_TEST_EXISTS) == FALSE) {
girara_error("File '%s' does not exist", path); girara_error("File '%s' does not exist", path);
return NULL; return NULL;
} }

9
tests/test_utils.c
View file

@ -4,10 +4,6 @@
#include "../utils.h" #include "../utils.h"
START_TEST(test_file_exists_null) {
fail_unless(file_exists(NULL) == false, NULL);
} END_TEST
START_TEST(test_file_get_extension_null) { START_TEST(test_file_get_extension_null) {
fail_unless(file_get_extension(NULL) == NULL, NULL); fail_unless(file_get_extension(NULL) == NULL, NULL);
} END_TEST } END_TEST
@ -34,11 +30,6 @@ Suite* suite_utils()
TCase* tcase = NULL; TCase* tcase = NULL;
Suite* suite = suite_create("Utils"); Suite* suite = suite_create("Utils");
/* file exists */
tcase = tcase_create("file_exists");
tcase_add_test(tcase, test_file_exists_null);
suite_add_tcase(suite, tcase);
/* file exists */ /* file exists */
tcase = tcase_create("file_get_extension"); tcase = tcase_create("file_get_extension");
tcase_add_test(tcase, test_file_get_extension_null); tcase_add_test(tcase, test_file_get_extension_null);

10
utils.c
View file

@ -17,16 +17,6 @@
#define BLOCK_SIZE 64 #define BLOCK_SIZE 64
bool
file_exists(const char* path)
{
if (!access(path, F_OK)) {
return true;
} else {
return false;
}
}
const char* const char*
file_get_extension(const char* path) file_get_extension(const char* path)
{ {

8
utils.h
View file

@ -17,14 +17,6 @@ typedef struct page_offset_s
int y; int y;
} page_offset_t; } page_offset_t;
/**
* Checks if the given file exists
*
* @param path Path to the file
* @return true if the file exists, otherwise false
*/
bool file_exists(const char* path);
/** /**
* Returns the file extension of a path * Returns the file extension of a path
* *