[EGIT] [core/efl] master 01/02: eet - fix signature alignment and position

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit 7b018a9740924012e6a4f3ab9c13dfbea3780934
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Wed Oct 7 14:32:37 2015 +0900

    eet - fix signature alignment and position
---
 src/lib/eet/eet_lib.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index 579dc28..367c740 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -481,22 +481,22 @@ eet_flush2(Eet_File *ef)
 
    /* write data */
    data_offset = orig_data_offset;
+   pad = 0;
    for (i = 0; i < num; i++)
      {
         for (efn = ef->header->directory->nodes[i]; efn; efn = efn->next)
           {
-             if (fwrite(efn->data, efn->size, 1, fp) != 1)
-               goto write_error;
-
-             data_offset += efn->size;
-
-             pad = (((data_offset + (ALIGN - 1)) / ALIGN) * ALIGN) - 
data_offset;
              if (pad > 0)
                {
                   data_offset += pad;
                   if (fwrite(zeros, pad, 1, fp) != 1)
                     goto write_error;
                }
+             if (fwrite(efn->data, efn->size, 1, fp) != 1)
+               goto write_error;
+
+             data_offset += efn->size;
+             pad = (((data_offset + (ALIGN - 1)) / ALIGN) * ALIGN) - 
data_offset;
           }
      }
 
@@ -882,10 +882,7 @@ eet_internal_read2(Eet_File *ef)
 
         /* compute the possible position of a signature */
         if (signature_base_offset < (efn->offset + efn->size))
-          {
-             signature_base_offset = efn->offset +
-               (((efn->size + (ALIGN - 1)) / ALIGN) * ALIGN);
-          }
+          signature_base_offset = efn->offset + efn->size;
      }
 
    ef->ed = NULL;

--