Archivo Tipo 2 Documentado para Doxygen.

[z.facultad/75.06/emufs.git] / emufs / idx.c

diff --git a/emufs/idx.c b/emufs/idx.c
index 6db15a33073b1e768fca12ab6c0194e6f6a3a740..f465d208635742bf99e1e4aa87c107da08bc0510 100644 (file)
--- a/emufs/idx.c
+++ b/emufs/idx.c
@@ -78,7 +78,6 @@ EMUFS_REG_ID emufs_idx_buscar_mayor_id_libre(EMUFS* emu, int* err)
        strcpy(name_f_idx, emu->nombre);
        strcat(name_f_idx, EMUFS_IDX_EXT);
 
-       (*err) = 0;
        if ((f_idx = fopen(name_f_idx, "rb")) == NULL) {
                PERR("No se puede abrir archivo");
                *err = 4; /* EMUFS_ERROR_CANT_OPEN_FILE */
@@ -210,9 +209,12 @@ EMUFS_REG_ID emufs_idx_get_new_id(EMUFS* efs, int* err)
 {
        EMUFS_REG_ID id;
 
-       (*err) = 0;
        id = emufs_did_get_last(efs, err);
        if (id == EMUFS_NOT_FOUND) {
+               if (*err) {
+                       PERR("error al obtener ultimo id");
+                       return id;
+               }
                id = emufs_idx_buscar_mayor_id_libre(efs, err);
                if (*err) {
                        PERR("error al obtener id mayor");
@@ -222,26 +224,26 @@ EMUFS_REG_ID emufs_idx_get_new_id(EMUFS* efs, int* err)
        return id;      
 }
 
-unsigned int emufs_idx_get_count(EMUFS *emu)
+EMUFS_REG_ID emufs_idx_get_count(EMUFS *emu)
 {
        FILE *fp;
        char name_f_idx[255];
-       long tam;
+       EMUFS_REG_ID tam;
        
        strcpy(name_f_idx,emu->nombre);
        strcat(name_f_idx, EMUFS_IDX_EXT);
 
-       fp = fopen(name_f_idx, "r");
+       fp = fopen(name_f_idx, "rb");
        if (fp == NULL) return 0;
 
-       fseek(fp, 0, SEEK_END);
+       fseek(fp, 0l, SEEK_END);
        tam = ftell(fp);
        fclose(fp);
 
        return tam/sizeof(EMUFS_IDX);
 }
 
-unsigned long emufs_idx_get_id_at(EMUFS *emu, unsigned int pos)
+EMUFS_REG_ID emufs_idx_get_id_at(EMUFS *emu, long pos)
 {
        FILE *fp;
        char name_f_idx[255];
@@ -250,7 +252,7 @@ unsigned long emufs_idx_get_id_at(EMUFS *emu, unsigned int pos)
        strcpy(name_f_idx,emu->nombre);
        strcat(name_f_idx, EMUFS_IDX_EXT);
 
-       fp = fopen(name_f_idx, "r");
+       fp = fopen(name_f_idx, "rb");
        if (fp == NULL) return EMUFS_NOT_FOUND;
 
        fseek(fp, pos*sizeof(EMUFS_IDX), SEEK_SET);
@@ -259,4 +261,3 @@ unsigned long emufs_idx_get_id_at(EMUFS *emu, unsigned int pos)
 
        return id.id_reg;
 }
-