errrr... hmmm why did this change?
authorraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Wed, 28 Jul 2010 02:48:11 +0000 (02:48 +0000)
committerraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Wed, 28 Jul 2010 02:48:11 +0000 (02:48 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@50574 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

16 files changed:
src/include/eina_accessor.h
src/include/eina_inlist.h
src/include/eina_list.h
src/lib/eina_convert.c
src/lib/eina_inlist.c
src/lib/eina_list.c
src/lib/eina_module.c
src/lib/eina_rectangle.c
src/lib/eina_share_common.c
src/lib/eina_str.c
src/lib/eina_strbuf_common.c
src/lib/eina_tiler.c
src/lib/eina_ustringshare.c
src/modules/mp/buddy/eina_buddy.c
src/modules/mp/one_big/eina_one_big.c
src/tests/evas_stringshare.c

index e00ee9e..89aca11 100644 (file)
@@ -136,7 +136,14 @@ EINA_ARG_NONNULL(1, 2);
 #define EINA_ACCESSOR_FOREACH(accessor, counter, data) for ((counter) = 0; \
                                                             eina_accessor_data_get(( \
                                                                                       accessor), \
-                                                                                   (counter), (void **)&(data)); (counter)++)
+                                                                                   ( \
+                                                                                      counter), \
+                                                                                   ( \
+                                                                                      void \
+                                                                                      * \
+                                                                                      *) \
+                                                                                   &(data)); \
+                                                            (counter)++)
 
 /**
  * @}
index a0a95d7..86f5f80 100644 (file)
@@ -110,18 +110,24 @@ EINA_MALLOC EINA_WARN_UNUSED_RESULT;
 #define EINA_INLIST_FOREACH(list, l) for (l = NULL, \
                                           l = \
                                              (list ? _EINA_INLIST_CONTAINER(l, \
-                                                                            list) : NULL); \
+                                                                            list) \
+                                              : NULL); \
                                           l; \
                                           l = \
                                              (EINA_INLIST_GET(l)->next ? \
                                               _EINA_INLIST_CONTAINER(l, \
                                                                      EINA_INLIST_GET( \
                                                                         l)-> \
-                                                                     next) : NULL))
+                                                                     next) : \
+                                              NULL))
 #define EINA_INLIST_REVERSE_FOREACH(list, l) for (l = NULL, \
                                                   l = \
                                                      (list ? \
-                                                      _EINA_INLIST_CONTAINER(l, list->last) : NULL); \
+                                                      _EINA_INLIST_CONTAINER(l, \
+                                                                             list \
+                                                                             -> \
+                                                                             last) \
+                                                      : NULL); \
                                                   l; \
                                                   l = \
                                                      (EINA_INLIST_GET(l)->prev \
index 28706bb..35c8079 100644 (file)
@@ -333,7 +333,8 @@ EINA_WARN_UNUSED_RESULT;
                                                          eina_list_data_get(l); \
                                                       l; \
                                                       l = eina_list_prev(l), \
-                                                      data = eina_list_data_get(l))
+                                                      data = \
+                                                         eina_list_data_get(l))
 
 /**
  * @def EINA_LIST_FOREACH_SAFE
@@ -373,10 +374,15 @@ EINA_WARN_UNUSED_RESULT;
 #define EINA_LIST_FOREACH_SAFE(list, l, l_next, data) for (l = list, \
                                                            l_next = \
                                                               eina_list_next(l), \
-                                                           data = eina_list_data_get(l); \
+                                                           data = \
+                                                              eina_list_data_get( \
+                                                                 l); \
                                                            l; \
                                                            l = l_next, l_next = \
-                                                              eina_list_next(l), data = eina_list_data_get(l))
+                                                              eina_list_next(l), \
+                                                           data = \
+                                                              eina_list_data_get( \
+                                                                 l))
 
 /**
  * @def EINA_LIST_REVERSE_FOREACH_SAFE
@@ -418,10 +424,20 @@ EINA_WARN_UNUSED_RESULT;
 #define EINA_LIST_REVERSE_FOREACH_SAFE(list, l, l_prev, data) for (l = \
                                                                       eina_list_last( \
                                                                          list), \
-                                                                   l_prev = eina_list_prev(l), data = eina_list_data_get(l); \
+                                                                   l_prev = \
+                                                                      eina_list_prev( \
+                                                                         l), \
+                                                                   data = \
+                                                                      eina_list_data_get( \
+                                                                         l); \
                                                                    l; \
                                                                    l = l_prev, \
-                                                                   l_prev = eina_list_prev(l), data = eina_list_data_get(l))
+                                                                   l_prev = \
+                                                                      eina_list_prev( \
+                                                                         l), \
+                                                                   data = \
+                                                                      eina_list_data_get( \
+                                                                         l))
 
 /**
  * @def EINA_LIST_FREE
@@ -451,7 +467,8 @@ EINA_WARN_UNUSED_RESULT;
 #define EINA_LIST_FREE(list, data) for (data = eina_list_data_get(list); list; \
                                         list = \
                                            eina_list_remove_list(list, \
-                                                                 list), data = eina_list_data_get(list))
+                                                                 list), data = \
+                                           eina_list_data_get(list))
 
 #include "eina_inline_list.x"
 
index a077a40..66b24fc 100644 (file)
@@ -642,13 +642,14 @@ eina_convert_fptoa(Eina_F32p32 fp, char *des)
 
    /* fp >= 1 */
    if (fp >= 0x0000000100000000LL)
-      while (fp >= 0x0000000100000000LL)
-        {
-           p++;
-           /* fp /= 2 */
-           fp >>= 1;
-        }
-      /* fp < 0.5 */
+     {
+        while (fp >= 0x0000000100000000LL)
+          {
+             p++;
+             /* fp /= 2 */
+             fp >>= 1;
+          } /* fp < 0.5 */
+     }
    else if (fp < 0x80000000)
       while (fp < 0x80000000)
         {
index 5f4b2f5..a02799b 100644 (file)
@@ -100,7 +100,6 @@ eina_inlist_accessor_get_at(Eina_Accessor_Inlist *it,
            i < idx && over != NULL;
            ++i, over = over->next)
          ;
-
    else
      {
         middle = it->index >> 1;
index 3d40e94..622930c 100644 (file)
@@ -1067,7 +1067,7 @@ eina_list_promote_list(Eina_List *list, Eina_List *move_list)
       return NULL;
 
    if (!move_list)
-      return list;  /* Promoting head to be head. */
+      return list; /* Promoting head to be head. */
 
    if (move_list == list)
       return list;
@@ -1136,7 +1136,7 @@ eina_list_demote_list(Eina_List *list, Eina_List *move_list)
       return NULL;
 
    if (!move_list)
-      return list;  /* Demoting tail to be tail. */
+      return list; /* Demoting tail to be tail. */
 
    if (move_list == list->accounting->last)
       return list;
@@ -1146,7 +1146,7 @@ eina_list_demote_list(Eina_List *list, Eina_List *move_list)
 
    /* Update pointer list if necessary. */
    if (list == move_list)
-      list = move_list->next;  /* Remove the demoted item from the list. */
+      list = move_list->next; /* Remove the demoted item from the list. */
 
    if (move_list->prev)
       move_list->prev->next = move_list->next;
index 4f407bc..21440ae 100644 (file)
@@ -153,7 +153,7 @@ static void _dir_list_cb(const char *name, const char *path, void *data)
         snprintf(file, length, "%s/%s", path, name);
         m = eina_module_new(file);
         if (!m)
-           return;  /* call the user provided cb on this module */
+           return; /* call the user provided cb on this module */
 
         if (!cb_data->cb(m, cb_data->data))
            eina_module_free(m);
@@ -488,7 +488,6 @@ EAPI char *eina_module_symbol_path_get(const void *symbol, const char *sub_dir)
              }
         }
 
-
 #endif /* ! HAVE_DLADDR */
 
    return NULL;
index e38e9d0..4c74fa5 100644 (file)
@@ -228,7 +228,7 @@ _eina_rectangle_empty_space_find(Eina_List *empty, int w, int h, int *x, int *y)
              }
 
            if (r)
-              empty = _eina_rectangle_merge_list(empty, r);  /* Return empty */
+              empty = _eina_rectangle_merge_list(empty, r); /* Return empty */
 
            return empty;
         }
index dabf06e..13e28e8 100644 (file)
@@ -252,10 +252,10 @@ _eina_share_common_population_stats(Eina_Share *share)
       fprintf(stderr, "eina share_common statistic:\n");
       fprintf(stderr,
            " * maximum shared strings : %i\n",
-              share->population.max);
+           share->population.max);
       fprintf(stderr,
            " * maximum shared strings per node : %i\n",
-              share->max_node_population);
+           share->max_node_population);
 
    for (i = 0;
         i < sizeof (share->population_group) /
@@ -924,7 +924,7 @@ eina_share_common_dump(Eina_Share *share, void (*additional_dump)(
    for (i = 0; i < EINA_SHARE_COMMON_BUCKETS; i++)
      {
         if (!share->share->buckets[i])
-           continue;  //       printf("DDD: BUCKET # %i (HEAD=%i, NODE=%i)\n", i,
+           continue; //        printf("DDD: BUCKET # %i (HEAD=%i, NODE=%i)\n", i,
 
 //            sizeof(Eina_Share_Common_Head), sizeof(Eina_Share_Common_Node));
         it = eina_rbtree_iterator_prefix(
index 15d1aec..d05a817 100644 (file)
@@ -229,6 +229,7 @@ eina_strlcpy(char *dst, const char *src, size_t siz)
         if (siz != 0)
           {
              *d = '\0'; /* NUL-terminate dst */
+
           }
 
         while (*s++)
index 54a6c4c..14a7807 100644 (file)
@@ -746,7 +746,7 @@ eina_strbuf_replace(Eina_Strbuf *buf,
         /* resize the buffer if necessary */
         if (EINA_UNLIKELY(!_eina_strbuf_common_grow(_STRBUF_CSIZE, buf,
                                                     buf->len - len1 + len2)))
-           return EINA_FALSE;  /* move the existing text */
+           return EINA_FALSE; /* move the existing text */
 
         memmove(buf->buf + pos + len2, buf->buf + pos + len1,
                 buf->len - pos - len1);
index bfba470..4e980f6 100644 (file)
@@ -286,29 +286,35 @@ static inline void _split_strict(list_t *dirty, const rect_t current, rect_t r)
      }
 
    if (w_1 > 0)
-      /* (b) r  .----.cur (a)
-       *     .--|-.  |      .--.r2   .-.r
-       *     |  | |  |  ->  |  |   + | |
-       *     `--|-'  |      `--'     `-'
-       *        `----'
-       */
-        rect_list_append_xywh(dirty, r.left, r.top, w_1, r.height);
-      /* not necessary to keep these, r (b) will be destroyed */
-      /* r.width -= w_1; */
-      /* r.left = current.left; */
+     {
+        /* (b) r  .----.cur (a)
+         *     .--|-.  |      .--.r2   .-.r
+         *     |  | |  |  ->  |  |   + | |
+         *     `--|-'  |      `--'     `-'
+         *        `----'
+         */
+        rect_list_append_xywh(dirty, r.left, r.top, w_1, r.height); /* not necessary to keep these, r (b) will be destroyed */
+
+     }
+
+   /* r.width -= w_1; */
+   /* r.left = current.left; */
 
    if (w_2 > 0)
-      /*  .----.cur (a)
-       *  |    |
-       *  |  .-|--.r (b)  .-.r   .--.r2
-       *  |  | |  |    -> | |  + |  |
-       *  |  `-|--'       `-'    `--'
-       *  `----'
-       */
+     {
+        /*  .----.cur (a)
+         *  |    |
+         *  |  .-|--.r (b)  .-.r   .--.r2
+         *  |  | |  |    -> | |  + |  |
+         *  |  `-|--'       `-'    `--'
+         *  `----'
+         */
         rect_list_append_xywh(dirty, current.right, r.top, w_2,
-                            r.height);
-      /* not necessary to keep this, r (b) will be destroyed */
-      /* r.width -= w_2; */
+                              r.height); /* not necessary to keep this, r (b) will be destroyed */
+
+     }
+
+   /* r.width -= w_2; */
 }
 
 static inline void _calc_intra_outer_rect_area(const rect_t a, const rect_t b,
@@ -849,7 +855,7 @@ rect_list_add_split_fuzzy(list_t *rects, list_node_t *node, int accepted_error)
  * this rect check was totally useless,
  * should never happen
  */
-                       /* prev_cur_node = cur_node; */
+/* prev_cur_node = cur_node; */
 /* cur_node = cur_node->next; */
                        printf("Should not get here!\n");
                        abort();
index a74adb8..ff6e685 100644 (file)
@@ -155,7 +155,8 @@ eina_ustringshare_add_length(const Eina_Unicode *str, unsigned int slen)
    return (const Eina_Unicode *)eina_share_common_add_length(ustringshare_share,
                                                              (const char *)str,
                                                              slen *
-                                                             sizeof(Eina_Unicode),
+                                                             sizeof(
+                                                                Eina_Unicode),
                                                              sizeof(
                                                                 Eina_Unicode));
 }
index 365949b..fc148b6 100644 (file)
@@ -165,11 +165,11 @@ static void _free(void *data, void *element)
 check:
    /* already on the last order */
    if (block->order + b->min_order == b->max_order)
-      goto end;  /* get the buddy */
+      goto end; /* get the buddy */
 
    buddy = &b->blocks[index ^ (1 << block->order)];
    if (!buddy->available)
-      goto end;  /* merge two blocks */
+      goto end; /* merge two blocks */
 
    b->areas[block->order] = eina_inlist_remove(b->areas[block->order],
                                                          EINA_INLIST_GET(buddy));
index 3d081bb..b6ac4e2 100644 (file)
@@ -218,8 +218,8 @@ eina_one_big_shutdown(void *data)
 #ifdef DEBUG
    if (pool->usage > 0)
       INF(
-          "Bad news we are destroying memory still referenced in mempool [%s]\n",
-          pool->name);
+         "Bad news we are destroying memory still referenced in mempool [%s]\n",
+         pool->name);
 
    if (pool->over > 0)
       INF("Bad news we are loosing track of pointer from mempool [%s]\n",
index 69375ed..66cef26 100644 (file)
@@ -192,7 +192,7 @@ evas_stringshare_add(const char *str)
    Evas_Stringshare_El *el, *pel = NULL;
 
    if (!str)
-      return NULL;  //   if (!f)
+      return NULL; //   if (!f)
 
 //     {
 //     char bf[256];