remove trailing spaces and factorize Windows detection

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/e17/libs/eet@34135 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.in b/configure.in
index e68e80a..6bb4d31 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,21 +34,17 @@ WIN32_CFLAGS=""
 WIN32_LIBS=""
 create_shared_lib=""
 case "$host_os" in
-       mingw|mingw32)
+       mingw|mingw32*|cegcc)
                PKG_CHECK_MODULES([EVIL], [evil])
                AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
                dnl needed for correct definition of EAPI
                AC_DEFINE(EFL_EET_BUILD, 1, [Define to mention that eet is built])
-               WIN32_LIBS="-lws2_32"
-               create_shared_lib="-no-undefined "
-               ;;
-       cegcc)
-               PKG_CHECK_MODULES([EVIL], [evil])
-               AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
-               dnl needed for correct definition of EAPI
-               AC_DEFINE(EFL_EET_BUILD, 1, [Define to mention that eet is built])
-               WIN32_CFLAGS="-mwin32"
-               WIN32_LIBS="-lws2"
+               if test "$host_os" = "cegcc" ; then
+                       WIN32_CFLAGS="-mwin32"
+                       WIN32_LIBS="-lws2"
+               else
+                       WIN32_LIBS="-lws2_32"
+               fi
                create_shared_lib="-no-undefined "
                ;;
 esac

diff --git a/src/bin/eet_main.c b/src/bin/eet_main.c
index b0ad7dd..289d2d2 100644 (file)
--- a/src/bin/eet_main.c
+++ b/src/bin/eet_main.c
@@ -10,7 +10,7 @@ do_eet_list(const char *file)
    int i, num;
    char **list;
    Eet_File *ef;
-   
+
    ef = eet_open(file, EET_FILE_MODE_READ);
    if (!ef)
      {
@@ -34,7 +34,7 @@ do_eet_extract(const char *file, const char *key, const char *out)
    void *data;
    int size = 0;
    FILE *f;
-   
+
    ef = eet_open(file, EET_FILE_MODE_READ);
    if (!ef)
      {
@@ -76,7 +76,7 @@ do_eet_decode(const char *file, const char *key, const char *out)
    void *data;
    int size = 0;
    FILE *f;
-   
+
    ef = eet_open(file, EET_FILE_MODE_READ);
    if (!ef)
      {
@@ -112,7 +112,7 @@ do_eet_insert(const char *file, const char *key, const char *out, int compress)
    void *data;
    int size = 0;
    FILE *f;
-   
+
    ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
    if (!ef)
      ef = eet_open(file, EET_FILE_MODE_WRITE);
@@ -156,7 +156,7 @@ do_eet_encode(const char *file, const char *key, const char *out, int compress)
    void *data;
    int size = 0;
    FILE *f;
-   
+
    ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
    if (!ef)
      ef = eet_open(file, EET_FILE_MODE_WRITE);
@@ -202,7 +202,7 @@ static void
 do_eet_remove(const char *file, const char *key)
 {
    Eet_File *ef;
-   
+
    ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
    if (!ef)
      {

diff --git a/src/lib/Eet.h b/src/lib/Eet.h
index f2baf97..d5e8556 100644 (file)
--- a/src/lib/Eet.h
+++ b/src/lib/Eet.h
@@ -230,19 +230,19 @@ extern "C" {
     * Return a handle to the shared string dictionary of the Eet file
     * @param ef A valid eet file handle.
     * @return A handle to the dictionary of the file
-    * 
+    *
     * This function returns a handle to the dictionary of an Eet file whose
     * handle is @p ef, if a dictionary exists. NULL is returned otherwise or
     * if the file handle is known to be invalid.
     */
    EAPI Eet_Dictionary *eet_dictionary_get(Eet_File *ef);
-   
+
    /**
     * Check if a given string comes from a given dictionary
     * @param ed A valid dictionary handle
     * @param string A valid 0 byte terminated C string
     * @return 1 if it is in the dictionary, 0 otherwise
-    * 
+    *
     * This checks the given dictionary to see if the given string is actually
     * inside that dictionary (i.e. comes from it) and returns 1 if it does.
     * If the dictionary handle is invlide, the string is NULL or the string is

diff --git a/src/lib/eet_lib.c b/src/lib/eet_lib.c
index 2c19658..da0f887 100644 (file)
--- a/src/lib/eet_lib.c
+++ b/src/lib/eet_lib.c
@@ -1065,7 +1065,7 @@ eet_internal_read(Eet_File *ef)
 
    if (eet_test_close((ef->data == (void *)-1) || (ef->data == NULL), ef))
      return NULL;
-   
+
    if (eet_test_close(ef->data_size < sizeof(int) * 3, ef))
      return NULL;
 
@@ -1080,7 +1080,7 @@ eet_internal_read(Eet_File *ef)
        eet_close(ef);
        break;
      }
-   
+
    return NULL;
 }