Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/epsilon
Dir : e17/libs/epsilon/src/lib
Modified Files:
Epsilon.c
Log Message:
Minor cleanups.
More to come later, but so far:
- Remove EAPI from c-file, it's already defined in header/prototype.
- Remove deprecated autoconf macros.
===================================================================
RCS file: /cvs/e/e17/libs/epsilon/src/lib/Epsilon.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- Epsilon.c 9 Nov 2007 03:00:34 -0000 1.43
+++ Epsilon.c 27 Nov 2007 06:43:06 -0000 1.44
@@ -1,7 +1,9 @@
#include "Epsilon.h"
#define X_DISPLAY_MISSING 1
#include "Epsilon_Plugin.h"
-#include "../config.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#ifdef HAVE_PNG_H
#include <png.h>
#endif
@@ -63,7 +65,7 @@
int mtime, char *uri);
#endif
-EAPI Epsilon *
+Epsilon *
epsilon_new (const char *file)
{
Epsilon *result = NULL;
@@ -71,8 +73,7 @@
{
if (file[0] == '/')
{
- result = malloc (sizeof (Epsilon));
- memset (result, 0, sizeof (Epsilon));
+ result = calloc (1, sizeof (Epsilon));
result->src = strdup (file);
result->tw = THUMB_SIZE_LARGE;
result->th = THUMB_SIZE_LARGE;
@@ -86,7 +87,7 @@
return (result);
}
-EAPI void
+void
epsilon_free (Epsilon * e)
{
if (e)
@@ -104,7 +105,7 @@
}
-Epsilon_Plugin*
+static Epsilon_Plugin*
epsilon_plugin_load(char* path)
{
Epsilon_Plugin* plugin = NULL;
@@ -126,7 +127,7 @@
}
static int epsilon_init_count = 0;
-EAPI int
+int
epsilon_init (void)
{
char buf[PATH_MAX];
@@ -189,7 +190,7 @@
return ++epsilon_init_count;
}
-EAPI void
+void
epsilon_key_set (Epsilon * e, const char *key)
{
if (e)
@@ -203,7 +204,7 @@
}
}
-EAPI void
+void
epsilon_resolution_set (Epsilon * e, int w, int h)
{
if (e && w > 0 && h > 0)
@@ -213,7 +214,7 @@
}
}
-EAPI const char *
+const char *
epsilon_file_get (Epsilon * e)
{
char *result = NULL;
@@ -222,7 +223,7 @@
return (result);
}
-EAPI const char *
+const char *
epsilon_thumb_file_get (Epsilon * e)
{
time_t mtime;
@@ -286,7 +287,7 @@
return (result);
}
-EAPI void
+void
epsilon_info_free (Epsilon_Info * info)
{
if (info)
@@ -301,7 +302,7 @@
}
}
-EAPI Epsilon_Info *
+Epsilon_Info *
epsilon_info_get (Epsilon * e)
{
FILE *fp = NULL;
@@ -402,7 +403,7 @@
return (p);
}
-EAPI int
+int
epsilon_info_exif_get (Epsilon_Info * info)
{
if (info)
@@ -479,7 +480,7 @@
return _epsilon_exists_ext_int(THUMB_SIZE_FAIL, e->hash, ext, path,
path_size, mtime);
}
-EAPI int
+int
epsilon_exists (Epsilon * e)
{
int ok = 0;
@@ -545,7 +546,7 @@
return (EPSILON_FAIL);
}
-EAPI int
+int
epsilon_generate (Epsilon * e)
{
int iw, ih;
@@ -733,7 +734,7 @@
return (EPSILON_FAIL);
}
-EAPI void
+void
epsilon_thumb_size(Epsilon *e, Epsilon_Thumb_Size size)
{
if (!e) return;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
