From: Leandro Lucarella Date: Sun, 11 Apr 2004 04:36:20 +0000 (+0000) Subject: Bugfixes para que compile (quedaron cosas colgadas al resolver el conflicto :). X-Git-Tag: svn_import_r684~551 X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/commitdiff_plain/07dca6914e0894f05543795c7c453168e0d572cd Bugfixes para que compile (quedaron cosas colgadas al resolver el conflicto :). --- diff --git a/emufs/did.c b/emufs/did.c index 0c7c10a..82fe63d 100644 --- 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 565cd3f..6cf562e 100644 --- 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 4cd2fc9..53d3f9d 100644 --- 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);