Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_file
Modified Files:
ecore_file.c ecore_file_download.c ecore_file_monitor.c
ecore_file_path.c ecore_file_private.h
Log Message:
and yet more warning removal
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- ecore_file.c 3 Jan 2006 00:18:42 -0000 1.43
+++ ecore_file.c 6 Jan 2006 18:46:30 -0000 1.44
@@ -1,14 +1,14 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "ecore_file_private.h"
#include <ctype.h>
+#include "ecore_file_private.h"
static int init = 0;
/* externally accessible functions */
-int
+EAPI int
ecore_file_init()
{
if (++init != 1) return init;
@@ -30,7 +30,7 @@
return --init;
}
-int
+EAPI int
ecore_file_shutdown()
{
if (--init != 0) return init;
@@ -42,7 +42,7 @@
return init;
}
-time_t
+EAPI time_t
ecore_file_mod_time(const char *file)
{
struct stat st;
@@ -51,7 +51,7 @@
return st.st_mtime;
}
-int
+EAPI int
ecore_file_size(const char *file)
{
struct stat st;
@@ -60,7 +60,7 @@
return st.st_size;
}
-int
+EAPI int
ecore_file_exists(const char *file)
{
struct stat st;
@@ -70,7 +70,7 @@
return 1;
}
-int
+EAPI int
ecore_file_is_dir(const char *file)
{
struct stat st;
@@ -82,28 +82,28 @@
static mode_t default_mode = S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP |
S_IROTH | S_IXOTH;
-int
+EAPI int
ecore_file_mkdir(const char *dir)
{
if (mkdir(dir, default_mode) < 0) return 0;
return 1;
}
-int
+EAPI int
ecore_file_rmdir(const char *dir)
{
if (rmdir(dir) < 0) return 0;
return 1;
}
-int
+EAPI int
ecore_file_unlink(const char *file)
{
if (unlink(file) < 0) return 0;
return 1;
}
-int
+EAPI int
ecore_file_recursive_rm(const char *dir)
{
DIR *dirp;
@@ -150,7 +150,7 @@
return ret;
}
-int
+EAPI int
ecore_file_mkpath(const char *path)
{
char ss[PATH_MAX];
@@ -177,7 +177,7 @@
return 1;
}
-int
+EAPI int
ecore_file_cp(const char *src, const char *dst)
{
FILE *f1, *f2;
@@ -203,7 +203,7 @@
return 1;
}
-int
+EAPI int
ecore_file_mv(const char *src, const char *dst)
{
if (ecore_file_exists(dst)) return 0;
@@ -211,7 +211,7 @@
return 1;
}
-int
+EAPI int
ecore_file_symlink(const char *src, const char *dest)
{
if(!symlink(src, dest))
@@ -219,7 +219,7 @@
return 0;
}
-char *
+EAPI char *
ecore_file_realpath(const char *file)
{
char buf[PATH_MAX];
@@ -229,18 +229,18 @@
return strdup(buf);
}
-const char *
+EAPI const char *
ecore_file_get_file(const char *path)
{
char *result = NULL;
if (!path) return NULL;
if ((result = strrchr(path, '/'))) result++;
- else result = path;
+ else result = (char *)path;
return result;
}
-char *
+EAPI char *
ecore_file_get_dir(char *file)
{
char *p;
@@ -256,7 +256,7 @@
return strdup(buf);
}
-int
+EAPI int
ecore_file_can_read(const char *file)
{
if (!file) return 0;
@@ -264,7 +264,7 @@
return 0;
}
-int
+EAPI int
ecore_file_can_write(const char *file)
{
if (!file) return 0;
@@ -272,7 +272,7 @@
return 0;
}
-int
+EAPI int
ecore_file_can_exec(const char *file)
{
if (!file) return 0;
@@ -280,7 +280,7 @@
return 0;
}
-char *
+EAPI char *
ecore_file_readlink(const char *link)
{
char buf[PATH_MAX];
@@ -291,7 +291,7 @@
return strdup(buf);
}
-Ecore_List *
+EAPI Ecore_List *
ecore_file_ls(const char *dir)
{
char *f;
@@ -339,7 +339,7 @@
return list;
}
-char *
+EAPI char *
ecore_file_app_exe_get(const char *app)
{
char *p, *pp, *exe1 = NULL, *exe2 = NULL;
@@ -482,7 +482,7 @@
return exe;
}
-char *
+EAPI char *
ecore_file_strip_ext(const char *path)
{
char *p, *file = NULL;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file_download.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_file_download.c 7 Sep 2005 08:57:08 -0000 1.7
+++ ecore_file_download.c 6 Jan 2006 18:46:30 -0000 1.8
@@ -80,12 +80,12 @@
return init;
}
-int
+EAPI int
ecore_file_download(const char *url, const char *dst,
void (*completion_cb)(void *data, const char *file, int
status),
void *data)
{
- if (!ecore_file_is_dir(ecore_file_get_dir(dst))) return 0;
+ if (!ecore_file_is_dir(ecore_file_get_dir((char *)dst))) return 0;
if (ecore_file_exists(dst)) return 0;
/* FIXME: Add handlers for http and ftp! */
@@ -120,7 +120,7 @@
}
}
-int
+EAPI int
ecore_file_download_protocol_available(const char *protocol)
{
if (!strncmp(protocol, "file://", 7)) return 1;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file_monitor.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_file_monitor.c 7 Sep 2005 08:57:08 -0000 1.6
+++ ecore_file_monitor.c 6 Jan 2006 18:46:30 -0000 1.7
@@ -74,7 +74,7 @@
return init;
}
-Ecore_File_Monitor *
+EAPI Ecore_File_Monitor *
ecore_file_monitor_add(const char *path,
void (*func) (void *data, Ecore_File_Monitor *em,
Ecore_File_Event event,
@@ -101,7 +101,7 @@
return NULL;
}
-void
+EAPI void
ecore_file_monitor_del(Ecore_File_Monitor *em)
{
switch (monitor_type)
@@ -126,7 +126,7 @@
}
}
-const char *
+EAPI const char *
ecore_file_monitor_path_get(Ecore_File_Monitor *em)
{
return em->path;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file_path.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ecore_file_path.c 7 Dec 2005 07:18:52 -0000 1.16
+++ ecore_file_path.c 6 Jan 2006 18:46:30 -0000 1.17
@@ -57,7 +57,7 @@
return path;
}
-int
+EAPI int
ecore_file_app_installed(const char *exe)
{
char *dir;
@@ -75,7 +75,7 @@
return 0;
}
-Ecore_List *
+EAPI Ecore_List *
ecore_file_app_list(void)
{
Ecore_List *list, *files;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file_private.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ecore_file_private.h 6 Sep 2005 23:33:05 -0000 1.11
+++ ecore_file_private.h 6 Jan 2006 18:46:30 -0000 1.12
@@ -22,39 +22,39 @@
};
#ifdef HAVE_INOTIFY
-EAPI int ecore_file_monitor_inotify_init(void);
-EAPI int ecore_file_monitor_inotify_shutdown(void);
-EAPI Ecore_File_Monitor *ecore_file_monitor_inotify_add(const char *path,
+int ecore_file_monitor_inotify_init(void);
+int ecore_file_monitor_inotify_shutdown(void);
+Ecore_File_Monitor *ecore_file_monitor_inotify_add(const char *path,
void (*func) (void
*data,
Ecore_File_Monitor *ecore_file_monitor,
Ecore_File_Event event,
const
char *path),
void *data);
-EAPI void ecore_file_monitor_inotify_del(Ecore_File_Monitor
*ecore_file_monitor);
+void ecore_file_monitor_inotify_del(Ecore_File_Monitor
*ecore_file_monitor);
#endif
#ifdef HAVE_FAM
-EAPI int ecore_file_monitor_fam_init(void);
-EAPI int ecore_file_monitor_fam_shutdown(void);
-EAPI Ecore_File_Monitor *ecore_file_monitor_fam_add(const char *path,
+int ecore_file_monitor_fam_init(void);
+int ecore_file_monitor_fam_shutdown(void);
+Ecore_File_Monitor *ecore_file_monitor_fam_add(const char *path,
void (*func) (void *data,
Ecore_File_Monitor *ecore_file_monitor,
Ecore_File_Event event,
const char
*path),
void *data);
-EAPI void ecore_file_monitor_fam_del(Ecore_File_Monitor
*ecore_file_monitor);
+void ecore_file_monitor_fam_del(Ecore_File_Monitor
*ecore_file_monitor);
#endif
#ifdef HAVE_POLL
-EAPI int ecore_file_monitor_poll_init(void);
-EAPI int ecore_file_monitor_poll_shutdown(void);
-EAPI Ecore_File_Monitor *ecore_file_monitor_poll_add(const char *path,
- void (*func) (void *data,
-
Ecore_File_Monitor *ecore_file_monitor,
-
Ecore_File_Event event,
- const char
*path),
- void *data);
-EAPI void ecore_file_monitor_poll_del(Ecore_File_Monitor
*ecore_file_monitor);
+int ecore_file_monitor_poll_init(void);
+int ecore_file_monitor_poll_shutdown(void);
+Ecore_File_Monitor *ecore_file_monitor_poll_add(const char *path,
+ void (*func) (void *data,
+
Ecore_File_Monitor *ecore_file_monitor,
+ Ecore_File_Event
event,
+ const char *path),
+ void *data);
+void ecore_file_monitor_poll_del(Ecore_File_Monitor
*ecore_file_monitor);
/* ecore_file_path */
int ecore_file_path_init(void);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
