Bugfixes para que compile (quedaron cosas colgadas al resolver el conflicto :).

diff --git a/emufs/did.c b/emufs/did.c
index 0c7c10a823baab79f54fc5aa3b88ac9496c57e47..82fe63d9c61d614b6c0d6464cd140ac7c7b2e2a5 100644 (file)
--- a/emufs/did.c
+++ b/emufs/did.c
@@ -81,7 +81,7 @@ EMUFS_REG_ID emufs_did_get_last(EMUFS *efs, int* err)
                        fclose(f_did);
                        PERR("Error al leer did");
                        *err = 3; /* EMUFS_ERROR_FILE_READ */
-                       return NULL;
+                       return EMUFS_NOT_FOUND;
                }
                /* voy al final */
                if (fseek(f_did, 0l, SEEK_END)) {

diff --git a/emufs/idx.c b/emufs/idx.c
index 565cd3fe97f148a12df6a002ae775b7ab349e3bb..6cf562ee7f44a96375d07a14652591666417414a 100644 (file)
--- a/emufs/idx.c
+++ b/emufs/idx.c
@@ -97,7 +97,7 @@ EMUFS_REG_ID emufs_idx_buscar_mayor_id_libre(EMUFS* emu, int* err)
        }
        fclose(f_idx);
 
-       if (b_found) {
+       if (found) {
                return ++max;
        } else {
                return 0;

diff --git a/emufs/tipo2.c b/emufs/tipo2.c
index 4cd2fc97a12fbd8e29f325d048d9093d7580b11a..53d3f9dba2f3186c70657d033c1feaa42f0150fc 100644 (file)
--- a/emufs/tipo2.c
+++ b/emufs/tipo2.c
@@ -85,7 +85,7 @@ EMUFS_REG_ID emufs_tipo2_grabar_registro(EMUFS *efs, void *ptr, EMUFS_REG_SIZE n
        } else {
                
                /* Obtengo un ID libre para el registro y luego grabo en disco */
-        n_IdReg = emufs_tipo2_get_id(efs);
+        n_IdReg = emufs_idx_get_new_id(efs, err);
                n_RegOffset = n_WrtOffset;
                fseek(f_data,n_RegOffset,0);