eina: cleanup eina_file_map_lines API before release.

SVN revision: 74618

3 files changed, 40 insertions, 42 deletions

diff --git a/src/include/eina_file.h b/src/include/eina_file.h
index 0518c12..31c4eb5 100644
--- a/src/include/eina_file.h
+++ b/src/include/eina_file.h
@@ -102,7 +102,7 @@ typedef struct _Eina_Stat Eina_Stat;
  * @typedef Eina_File_Lines
  * A typedef to #_Eina_File_Lines.
  */
-typedef struct _Eina_File_Lines Eina_File_Lines;
+typedef struct _Eina_File_Line Eina_File_Line;
 
 /**
  * @typedef Eina_File_Dir_List_Cb
@@ -195,17 +195,15 @@ struct _Eina_Stat
 };
 
 /**
- * @struct _Eina_File_Lines
+ * @struct _Eina_File_Line
  * A structure to store information of line
  * @since 1.3
  */
-struct _Eina_File_Lines
+struct _Eina_File_Line
 {
-  struct {
-    const char *start;
-    const char *end;
-    unsigned int index;
-  } line;
+  const char *start;
+  const char *end;
+  unsigned int index;
   unsigned long long length;
 };
 
diff --git a/src/lib/eina_file.c b/src/lib/eina_file.c
index 7538c0c..bdfe2a7 100644
--- a/src/lib/eina_file.c
+++ b/src/lib/eina_file.c
@@ -1137,7 +1137,7 @@ struct _Eina_Lines_Iterator
 
    int boundary;
 
-   Eina_File_Lines current;
+   Eina_File_Line current;
 };
 
 /* search '\r' and '\n' by preserving cache locality and page locality
@@ -1177,32 +1177,32 @@ _eina_file_map_lines_iterator_next(Eina_Lines_Iterator *it, void **data)
    const char *eol;
    unsigned char match;
 
-   if (it->current.line.end >= it->end)
+   if (it->current.end >= it->end)
      return EINA_FALSE;
 
-   match = *it->current.line.end;
-   while ((*it->current.line.end == '\n' || *it->current.line.end == '\r')
-          && it->current.line.end < it->end)
+   match = *it->current.end;
+   while ((*it->current.end == '\n' || *it->current.end == '\r')
+          && it->current.end < it->end)
      {
-        if (match == *it->current.line.end)
-          it->current.line.index++;
-        it->current.line.end++;
+        if (match == *it->current.end)
+          it->current.index++;
+        it->current.end++;
      }
-   it->current.line.index++;
+   it->current.index++;
 
-   if (it->current.line.end == it->end)
+   if (it->current.end == it->end)
      return EINA_FALSE;
 
-   eol = _eina_fine_eol(it->current.line.end,
+   eol = _eina_fine_eol(it->current.end,
                         it->boundary,
                         it->end);
    it->boundary = (uintptr_t) eol & 0x3FF;
    if (it->boundary == 0) it->boundary = 4096;
 
-   it->current.line.start = it->current.line.end;
+   it->current.start = it->current.end;
 
-   it->current.line.end = eol;
-   it->current.length = eol - it->current.line.start - 1;
+   it->current.end = eol;
+   it->current.length = eol - it->current.start - 1;
 
    *data = &it->current;
    return EINA_TRUE;
@@ -1251,9 +1251,9 @@ eina_file_map_lines(Eina_File *file)
 
    it->fp = file;
    it->boundary = 4096;
-   it->current.line.start = it->map;
-   it->current.line.end = it->current.line.start;
-   it->current.line.index = 0;
+   it->current.start = it->map;
+   it->current.end = it->current.start;
+   it->current.index = 0;
    it->current.length = 0;
    it->end = it->map + it->fp->length;
 
diff --git a/src/lib/eina_file_win32.c b/src/lib/eina_file_win32.c
index f507bf9..af547fa 100644
--- a/src/lib/eina_file_win32.c
+++ b/src/lib/eina_file_win32.c
@@ -117,7 +117,7 @@ struct _Eina_Lines_Iterator
 
    int boundary;
 
-   Eina_File_Lines current;
+   Eina_File_Line current;
 };
 
 struct _Eina_File_Direct_Iterator
@@ -612,32 +612,32 @@ _eina_file_map_lines_iterator_next(Eina_Lines_Iterator *it, void **data)
    const char *eol;
    unsigned char match;
 
-   if (it->current.line.end >= it->end)
+   if (it->current.end >= it->end)
      return EINA_FALSE;
 
-   match = *it->current.line.end;
-   while ((*it->current.line.end == '\n' || *it->current.line.end == '\r')
-          && it->current.line.end < it->end)
+   match = *it->current.end;
+   while ((*it->current.end == '\n' || *it->current.end == '\r')
+          && it->current.end < it->end)
      {
-        if (match == *it->current.line.end)
-          it->current.line.index++;
-        it->current.line.end++;
+        if (match == *it->current.end)
+          it->current.index++;
+        it->current.end++;
      }
-   it->current.line.index++;
+   it->current.index++;
 
-   if (it->current.line.end == it->end)
+   if (it->current.end == it->end)
      return EINA_FALSE;
 
-   eol = _eina_fine_eol(it->current.line.end,
+   eol = _eina_fine_eol(it->current.end,
                         it->boundary,
                         it->end);
    it->boundary = (uintptr_t) eol & 0x3FF;
    if (it->boundary == 0) it->boundary = 4096;
 
-   it->current.line.start = it->current.line.end;
+   it->current.start = it->current.end;
 
-   it->current.line.end = eol;
-   it->current.length = eol - it->current.line.start - 1;
+   it->current.end = eol;
+   it->current.length = eol - it->current.start - 1;
 
    *data = &it->current;
    return EINA_TRUE;
@@ -1187,9 +1187,9 @@ eina_file_map_lines(Eina_File *file)
 
    it->fp = file;
    it->boundary = 4096;
-   it->current.line.start = it->map;
-   it->current.line.end = it->current.line.start;
-   it->current.line.index = 0;
+   it->current.start = it->map;
+   it->current.end = it->current.start;
+   it->current.index = 0;
    it->current.length = 0;
    it->end = it->map + it->fp->length;