[ROLLBACK to below revision]

commit 188c39ba4da174d6cd622405f4ac94f7ff4cfb51
Author: Daniel Juyung Seo <juyung.seo@samsung.com>
Date:   Thu Nov 25 14:37:53 2010 +0900
    [Overwrite from SVN Revision 54761]

diff --git a/Makefile.am b/Makefile.am
index 071d4e9..1764986 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,7 @@ lcov-reset:
 lcov-report:
        @mkdir coverage
        @lcov --compat-libtool --directory $(top_srcdir)/src --capture --output-file coverage/coverage.info
-       @lcov -l coverage/coverage.info |grep "\\.h"  |cut -d " " -f 2 > coverage/remove
+       @lcov -l coverage/coverage.info | grep -v "`cd $(top_srcdir) && pwd`" | cut -d: -f1 > coverage/remove
        @lcov -r coverage/coverage.info `cat coverage/remove` > coverage/coverage.cleaned.info
        @rm coverage/remove
        @mv coverage/coverage.cleaned.info coverage/coverage.info

diff --git a/configure.ac b/configure.ac
index d23aff9..fb87b29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ m4_define([lt_cur], v_mic)
 m4_define([lt_age], v_min)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-
+ 
 AC_INIT([eina], [v_ver.beta2], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -455,7 +455,7 @@ if test "x${have_iconv}" = "xno" ; then
 
    if test "x${have_iconv}" = "xyes" ; then
       AC_MSG_CHECKING([whether iconv() is in libc])
-
+      
       AC_LINK_IFELSE(
          [AC_LANG_PROGRAM(
              [[

diff --git a/debian/changelog b/debian/changelog
index 1cafb0e..fb1d2b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,3 @@
-eina (1.0.0.001+svn.55075slp2+build01) unstable; urgency=low
-
-  * [SVN 55075 Merge]
-  * Update to SVN Revision 55075.
-  * Git: 165.213.180.234:/git/slp/pkgs/eina
-  * Tag: eina_1.0.0.001+svn.55075slp2+build01
-
- -- Myoungwoon Kim <myoungwoon.kim@samsung.com>  Thu, 02 Dec 2010 08:45:42 +0900
-
 eina (1.0.0.001+svn.51480slp2+build04) unstable; urgency=low
 
   * [SVN 54761 Merge]

diff --git a/debian/control b/debian/control
index cef5534..558a760 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Jaehwan Kim <jae.hwan.kim@samsung.com>, Juyung Seo <juyung.seo@samsung.com>
 Original-Maintainer: Debian Pkg-e Team <pkg-e-devel@lists.alioth.debian.org>
-Uploaders: Albin Tonnerre <albin.tonnerre@gmail.com>, Jan Lübbe<jluebbe@debian.org>,Myoungwoon Kim <myoungwoon.kim@samsung.com>, Sangjin Lee <lsj119@samsung.com>
+Uploaders: Albin Tonnerre <albin.tonnerre@gmail.com>, Jan Lübbe<jluebbe@debian.org>, Sangjin Lee <lsj119@samsung.com>
 Build-Depends: debhelper (>= 6), cdbs, doxygen, pkg-config, libtool, automake
 Standards-Version: 3.8.3
 Homepage: http://www.enlightenment.org

diff --git a/src/include/eina_array.h b/src/include/eina_array.h
index e8ca73f..3accc6d 100644 (file)
--- a/src/include/eina_array.h
+++ b/src/include/eina_array.h
@@ -80,7 +80,7 @@ EAPI void        eina_array_free(Eina_Array *array) EINA_ARG_NONNULL(1);
 EAPI void        eina_array_step_set(Eina_Array  *array,
                                      unsigned int sizeof_eina_array,
                                      unsigned int step) EINA_ARG_NONNULL(1);
-static inline void eina_array_clean(Eina_Array *array) EINA_ARG_NONNULL(1);
+EAPI void eina_array_clean(Eina_Array *array) EINA_ARG_NONNULL(1);
 EAPI void eina_array_flush(Eina_Array *array) EINA_ARG_NONNULL(1);
 EAPI Eina_Bool eina_array_remove(Eina_Array * array,
                                  Eina_Bool (*keep)(void *data, void *gdata),
@@ -92,7 +92,7 @@ static inline void     *eina_array_data_get(const Eina_Array *array,
                                             unsigned int      idx) EINA_ARG_NONNULL(1);
 static inline void      eina_array_data_set(const Eina_Array *array,
                                             unsigned int      idx,
-                                            const void       *data) EINA_ARG_NONNULL(1);
+                                            const void       *data) EINA_ARG_NONNULL(1, 3);
 static inline unsigned int eina_array_count_get(const Eina_Array *array) EINA_ARG_NONNULL(1);
 EAPI Eina_Iterator        *eina_array_iterator_new(const Eina_Array *array) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 EAPI Eina_Accessor        *eina_array_accessor_new(const Eina_Array *array) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;

diff --git a/src/include/eina_inline_array.x b/src/include/eina_inline_array.x
index 5216462..883d728 100644 (file)
--- a/src/include/eina_inline_array.x
+++ b/src/include/eina_inline_array.x
@@ -175,21 +175,6 @@ eina_array_foreach(Eina_Array *array, Eina_Each_Cb cb, void *fdata)
 }
 
 /**
- * @brief Clean an array.
- *
- * @param array The array to clean.
- *
- * This function sets the count member of @p array to 0. For
- * performance reasons, there is no check of @p array. If it is
- * @c NULL or invalid, the program may crash.
- */
-static inline void
-eina_array_clean(Eina_Array *array)
-{
-   array->count = 0;
-}
-
-/**
  * @}
  */
 

diff --git a/src/lib/eina_array.c b/src/lib/eina_array.c
index 3bf6d73..bd71fc9 100644 (file)
--- a/src/lib/eina_array.c
+++ b/src/lib/eina_array.c
@@ -484,6 +484,24 @@ eina_array_step_set(Eina_Array *array,
 }
 
 /**
+ * @brief Clean an array.
+ *
+ * @param array The array to clean.
+ *
+ * This function sets the count member of @p array to 0. For
+ * performance reasons, there is no check of @p array. If it is
+ * @c NULL or invalid, the program may crash.
+ */
+EAPI void
+eina_array_clean(Eina_Array *array)
+{
+   EINA_SAFETY_ON_NULL_RETURN(array);
+   EINA_MAGIC_CHECK_ARRAY(array);
+
+   array->count = 0;
+}
+
+/**
  * @brief Flush an array.
  *
  * @param array The array to flush.

diff --git a/src/lib/eina_inlist.c b/src/lib/eina_inlist.c
index 91ac278..6343907 100644 (file)
--- a/src/lib/eina_inlist.c
+++ b/src/lib/eina_inlist.c
@@ -26,7 +26,6 @@
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_error.h"
-#include "eina_log.h"
 
 /* undefs EINA_ARG_NONULL() so NULL checks are not compiled out! */
 #include "eina_safety_checks.h"

diff --git a/src/lib/eina_log.c b/src/lib/eina_log.c
index 8c04f46..0bcdaec 100644 (file)
--- a/src/lib/eina_log.c
+++ b/src/lib/eina_log.c
@@ -1516,7 +1516,7 @@ eina_log_print_unlocked(int domain,
         }
 
       tmp = wfmt;
-      while (strchr(tmp, '%'))
+      while (strchr(tmp, "%"))
         {
            tmp++;
            if (*tmp == 'z')

diff --git a/src/modules/mp/buddy/Makefile.am b/src/modules/mp/buddy/Makefile.am
index d65c268..9b26aa7 100644 (file)
--- a/src/modules/mp/buddy/Makefile.am
+++ b/src/modules/mp/buddy/Makefile.am
@@ -24,7 +24,7 @@ module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 
 install-data-hook:
-       rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+       rm -f $(controllerdir)/$(controller_LTLIBRARIES)
 
 endif
 endif

diff --git a/src/modules/mp/chained_pool/Makefile.am b/src/modules/mp/chained_pool/Makefile.am
index a18564d..441c608 100644 (file)
--- a/src/modules/mp/chained_pool/Makefile.am
+++ b/src/modules/mp/chained_pool/Makefile.am
@@ -25,7 +25,7 @@ module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 
 install-data-hook:
-       rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+       rm -f $(controllerdir)/$(controller_LTLIBRARIES)
 
 endif
 endif

diff --git a/src/modules/mp/ememoa_fixed/Makefile.am b/src/modules/mp/ememoa_fixed/Makefile.am
index 6def911..aa7d28f 100644 (file)
--- a/src/modules/mp/ememoa_fixed/Makefile.am
+++ b/src/modules/mp/ememoa_fixed/Makefile.am
@@ -25,7 +25,7 @@ module_la_LDFLAGS      = -no-undefined @lt_enable_auto_import@ -module -avoid-ve
 module_la_LIBTOOLFLAGS = --tag=disable-static
 
 install-data-hook:
-       rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+       rm -f $(controllerdir)/$(controller_LTLIBRARIES)
 
 endif
 endif

diff --git a/src/modules/mp/ememoa_unknown/Makefile.am b/src/modules/mp/ememoa_unknown/Makefile.am
index 1da3057..edde8e6 100644 (file)
--- a/src/modules/mp/ememoa_unknown/Makefile.am
+++ b/src/modules/mp/ememoa_unknown/Makefile.am
@@ -25,7 +25,7 @@ module_la_LDFLAGS      = -no-undefined @lt_enable_auto_import@ -module -avoid-ve
 module_la_LIBTOOLFLAGS = --tag=disable-static
 
 install-data-hook:
-       rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+       rm -f $(controllerdir)/$(controller_LTLIBRARIES)
 
 endif
 endif

diff --git a/src/modules/mp/fixed_bitmap/Makefile.am b/src/modules/mp/fixed_bitmap/Makefile.am
index 90ff60f..0381bea 100644 (file)
--- a/src/modules/mp/fixed_bitmap/Makefile.am
+++ b/src/modules/mp/fixed_bitmap/Makefile.am
@@ -24,7 +24,7 @@ module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 
 install-data-hook:
-       rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+       rm -f $(controllerdir)/$(controller_LTLIBRARIES)
 
 endif
 endif

diff --git a/src/modules/mp/one_big/Makefile.am b/src/modules/mp/one_big/Makefile.am
index 427d247..03e6234 100644 (file)
--- a/src/modules/mp/one_big/Makefile.am
+++ b/src/modules/mp/one_big/Makefile.am
@@ -25,7 +25,7 @@ module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 
 install-data-hook:
-       rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+       rm -f $(controllerdir)/$(controller_LTLIBRARIES)
 
 endif
 endif

diff --git a/src/modules/mp/pass_through/Makefile.am b/src/modules/mp/pass_through/Makefile.am
index cf7daca..2adb58d 100644 (file)
--- a/src/modules/mp/pass_through/Makefile.am
+++ b/src/modules/mp/pass_through/Makefile.am
@@ -24,7 +24,7 @@ module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 
 install-data-hook:
-       rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+       rm -f $(controllerdir)/$(controller_LTLIBRARIES)
 
 endif
 endif