E SVN: raster IN trunk: e_dbus/src/lib/dbus ecore/src/lib/ecore edje/src/lib eet/src/lib eeze/src/lib efreet/src/lib eina/src/lib eio/src/lib elementary/src/lib embryo/src/lib emotion/src/lib ethumb/src/lib evas/src/lib/canvas

[Enlightenment S. <no-...@en...>]

Log:
This is a small change, so I won't changelog it (or backport), but
  make _shutdown() funcs across efl complain and be unhappy if you
  shutdown to < 0 shutdowns and not pull init count below 0.
  
  

Author:       raster
Date:         2012-05-30 03:08:41 -0700 (Wed, 30 May 2012)
New Revision: 71548
Trac:         http://trac.enlightenment.org/e/changeset/71548

Modified:
  trunk/e_dbus/src/lib/dbus/e_dbus.c trunk/ecore/src/lib/ecore/ecore.c trunk/edje/src/lib/edje_main.c trunk/eet/src/lib/eet_lib.c trunk/eeze/src/lib/eeze_main.c trunk/efreet/src/lib/efreet.c trunk/eina/src/lib/eina_main.c trunk/eio/src/lib/eio_main.c trunk/elementary/src/lib/elm_main.c trunk/embryo/src/lib/embryo_main.c trunk/emotion/src/lib/emotion_main.c trunk/ethumb/src/lib/ethumb.c trunk/evas/src/lib/canvas/evas_main.c 

Modified: trunk/e_dbus/src/lib/dbus/e_dbus.c
===================================================================
--- trunk/e_dbus/src/lib/dbus/e_dbus.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/e_dbus/src/lib/dbus/e_dbus.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -636,7 +636,12 @@
 EAPI int
 e_dbus_shutdown(void)
 {
-  if (--_edbus_init_count)
+   if (_edbus_init_count <= 0)
+     {
+        EINA_LOG_ERR("Init count not greater than 0 in shutdown.");
+        return 0;
+     }
+   if (--_edbus_init_count)
     return _edbus_init_count;
 
   e_dbus_object_shutdown();

Modified: trunk/ecore/src/lib/ecore/ecore.c
===================================================================
--- trunk/ecore/src/lib/ecore/ecore.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/ecore/src/lib/ecore/ecore.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -228,6 +228,12 @@
     * take a lock here because _ecore_event_shutdown() does callbacks
     */
      _ecore_lock();
+     if (_ecore_init_count <= 0)
+       {
+          ERR("Init count not greater than 0 in shutdown.");
+          _ecore_unlock();
+          return 0;
+       }
      if (--_ecore_init_count != 0)
        goto unlock;
    

Modified: trunk/edje/src/lib/edje_main.c
===================================================================
--- trunk/edje/src/lib/edje_main.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/edje/src/lib/edje_main.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -170,6 +170,11 @@
 EAPI int
 edje_shutdown(void)
 {
+   if (_edje_init_count <= 0)
+     {
+        ERR("Init count not greater than 0 in shutdown.");
+        return 0;
+     }
    if (--_edje_init_count != 0)
      return _edje_init_count;
 

Modified: trunk/eet/src/lib/eet_lib.c
===================================================================
--- trunk/eet/src/lib/eet_lib.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/eet/src/lib/eet_lib.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -633,6 +633,11 @@
 EAPI int
 eet_shutdown(void)
 {
+   if (eet_init_count <= 0)
+     {
+        ERR("Init count not greater than 0 in shutdown.");
+        return 0;
+     }
    if (--eet_init_count != 0)
      return eet_init_count;
 

Modified: trunk/eeze/src/lib/eeze_main.c
===================================================================
--- trunk/eeze/src/lib/eeze_main.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/eeze/src/lib/eeze_main.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -82,6 +82,11 @@
 EAPI int
 eeze_shutdown(void)
 {
+   if (_eeze_init_count <= 0)
+     {
+        EINA_LOG_ERR("Init count not greater than 0 in shutdown.");
+        return 0;
+     }
    if (--_eeze_init_count != 0)
      return _eeze_init_count;
 

Modified: trunk/efreet/src/lib/efreet.c
===================================================================
--- trunk/efreet/src/lib/efreet.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/efreet/src/lib/efreet.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -136,6 +136,11 @@
 EAPI int
 efreet_shutdown(void)
 {
+    if (_efreet_init_count <= 0)
+      {
+         ERR("Init count not greater than 0 in shutdown.");
+         return 0;
+      }
     if (--_efreet_init_count != 0)
         return _efreet_init_count;
 

Modified: trunk/eina/src/lib/eina_main.c
===================================================================
--- trunk/eina/src/lib/eina_main.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/eina/src/lib/eina_main.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -307,6 +307,11 @@
 EAPI int
 eina_shutdown(void)
 {
+   if (_eina_main_count <= 0)
+     {
+        ERR("Init count not greater than 0 in shutdown.");
+        return 0;
+     }
    _eina_main_count--;
    if (EINA_UNLIKELY(_eina_main_count == 0))
      {

Modified: trunk/eio/src/lib/eio_main.c
===================================================================
--- trunk/eio/src/lib/eio_main.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/eio/src/lib/eio_main.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -236,6 +236,11 @@
    Eio_Progress *pg;
    Eio_File_Associate *asso;
 
+   if (_eio_count <= 0)
+     {
+        EINA_LOG_ERR("Init count not greater than 0 in shutdown.");
+        return 0;
+     }
    _eio_count--;
 
    if (_eio_count > 0) return _eio_count;

Modified: trunk/elementary/src/lib/elm_main.c
===================================================================
--- trunk/elementary/src/lib/elm_main.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/elementary/src/lib/elm_main.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -185,6 +185,11 @@
 EAPI int
 elm_shutdown(void)
 {
+   if (_elm_init_count <= 0)
+     {
+        ERR("Init count not greater than 0 in shutdown.");
+        return 0;
+     }
    _elm_init_count--;
    if (_elm_init_count > 0) return _elm_init_count;
    _elm_win_shutdown();

Modified: trunk/embryo/src/lib/embryo_main.c
===================================================================
--- trunk/embryo/src/lib/embryo_main.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/embryo/src/lib/embryo_main.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -2,6 +2,7 @@
 # include "config.h"
 #endif
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 
@@ -29,6 +30,11 @@
 EAPI int
 embryo_shutdown(void)
 {
+   if (_embryo_init_count <= 0)
+     {
+        printf("%s:%i Init count not greater than 0 in shutdown.", __FUNCTION__, __LINE__);
+        return 0;
+     }
    if (--_embryo_init_count != 0)
      return _embryo_init_count;
 

Modified: trunk/emotion/src/lib/emotion_main.c
===================================================================
--- trunk/emotion/src/lib/emotion_main.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/emotion/src/lib/emotion_main.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -383,6 +383,11 @@
 {
    Emotion_Webcam *ew;
 
+   if (_emotion_webcams_count <= 0)
+     {
+        EINA_LOG_ERR("Init count not greater than 0 in shutdown.");
+        return EINA_FALSE;
+     }
    if (--_emotion_webcams_count) return EINA_TRUE;
 
    EINA_LIST_FREE(_emotion_webcams->webcams, ew)

Modified: trunk/ethumb/src/lib/ethumb.c
===================================================================
--- trunk/ethumb/src/lib/ethumb.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/ethumb/src/lib/ethumb.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -202,6 +202,11 @@
 EAPI int
 ethumb_shutdown(void)
 {
+   if (initcount <= 0)
+     {
+        EINA_LOG_ERR("Init count not greater than 0 in shutdown.");
+        return 0;
+     }
    initcount--;
    if (initcount == 0)
      {

Modified: trunk/evas/src/lib/canvas/evas_main.c
===================================================================
--- trunk/evas/src/lib/canvas/evas_main.c	2012-05-30 09:14:45 UTC (rev 71547)
+++ trunk/evas/src/lib/canvas/evas_main.c	2012-05-30 10:08:41 UTC (rev 71548)
@@ -77,6 +77,11 @@
 EAPI int
 evas_shutdown(void)
 {
+   if (_evas_init_count <= 0)
+     {
+        EINA_LOG_ERR("Init count not greater than 0 in shutdown.");
+        return 0;
+     }
    if (--_evas_init_count != 0)
      return _evas_init_count;