tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=b33923ceed1b305aa9319303c41b374ee153ed46

commit b33923ceed1b305aa9319303c41b374ee153ed46
Author: Tom Hacohen <t...@stosb.com>
Date:   Fri Oct 2 09:30:49 2015 +0100

    Revert "eina_tmpstr: add eina_tmpstr_strftime"
    
    As agreed on the ML, eina_tmpstr_strftime() should be removed.
    
    This reverts commit abaf29cb768375957c9ee0b64d36034c21c618ea.
---
 AUTHORS                    |  1 -
 src/lib/eina/eina_tmpstr.c | 39 ++-------------------------------------
 src/lib/eina/eina_tmpstr.h | 25 -------------------------
 3 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f714c39..eab2011 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -53,7 +53,6 @@ ChunEon Park (Hermet) <her...@hermet.pe.kr>
 Rajeev Ranjan (Rajeev) <rajee...@samsung.com> <rajeev.jn...@gmail.com>
 Subodh Kumar <s7158.ku...@samsung.com>
 Michelle Legrand <legrand.miche...@outlook.com>
-Shilpa Singh <shilpa.si...@samsung.com> <shilpasing...@gmail.com>
 
 Eet
 ---
diff --git a/src/lib/eina/eina_tmpstr.c b/src/lib/eina/eina_tmpstr.c
index 5b81819..43824b7 100644
--- a/src/lib/eina/eina_tmpstr.c
+++ b/src/lib/eina/eina_tmpstr.c
@@ -133,48 +133,13 @@ eina_tmpstr_len(Eina_Tmpstr *tmpstr)
    for (s = strs; s; s = s->next)
      {
         if (s->str == tmpstr)
-          {
+         {
              size_t ret = s->length;
              eina_lock_release(&_mutex);
              return ret;
-          }
+         }
      }
    eina_lock_release(&_mutex);
 
    return strlen(tmpstr);
 }
-
-EAPI Eina_Tmpstr *
-eina_tmpstr_strftime(const char *format, const struct tm *tm)
-{
-   const size_t flen = strlen(format);
-   size_t buflen = 16; // An arbitrary starting size
-   char *buf = NULL;
-
-   do {
-      char *tmp;
-      size_t len;
-
-      tmp = realloc(buf, buflen * sizeof(char));
-      if (!tmp) goto on_error;
-      buf = tmp;
-
-      len = strftime(buf, buflen, format, tm);
-      // Check if we have the expected result and return it.
-      if ((len > 0 && len < buflen) || (len == 0 && flen == 0))
-        {
-           Eina_Tmpstr *r;
-
-           r = eina_tmpstr_add_length(buf, len + 1);
-           free(buf);
-           return r;
-        }
-
-      /* Possibly buf overflowed - try again with a bigger buffer */
-      buflen <<= 1; // multiply buffer size by 2
-   } while (buflen < 128 * flen);
-
- on_error:
-   free(buf);
-   return NULL;
-}
diff --git a/src/lib/eina/eina_tmpstr.h b/src/lib/eina/eina_tmpstr.h
index 8d9f517..f784a67 100644
--- a/src/lib/eina/eina_tmpstr.h
+++ b/src/lib/eina/eina_tmpstr.h
@@ -238,31 +238,6 @@ EAPI size_t eina_tmpstr_len(Eina_Tmpstr *tmpstr);
 EAPI void eina_tmpstr_del(Eina_Tmpstr *tmpstr) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Add a new temporary string based on strftime output.
- *
- * @param tm Pointer to a tm structure needed by strftime.
- * @param format String containing format specifiers needed by strftime.
- *
- * This will add a new temporary string by updating the string value by output
- * of strftime.
- *
- * Example usage:
- *
- * @code
- * time_t curr_time;
- * struct tm * info;
- * Eina_Tmpstr *buf;
- *
- * curr_time = time(NULL);
- * info = localtime(&curr_time);
- * buf = eina_tmpstr_strftime("%I:%M%p", info);
- * @endcode
- *
- * @since 1.16.0
- */
-EAPI Eina_Tmpstr *eina_tmpstr_strftime(const char *format, const struct tm 
*tm) EINA_ARG_NONNULL(2);
-
-/**
  * @}
  */
 

-- 


Reply via email to