Se eliminan warnings. Solo quedan los del truncate() que no puedo entender por que...

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

diff --git a/emufs/idx.c b/emufs/idx.c
index 701ba2597cdf0be3fd123c0dcaec0414045c7a18..a8c76bbebf90b766a4d9da1465ffa559071555fb 100644 (file)
--- a/emufs/idx.c
+++ b/emufs/idx.c
@@ -140,7 +140,7 @@ int emufs_idx_agregar(EMUFS *emu, EMUFS_REG_ID id_reg, EMUFS_BLOCK_ID location)
        strcpy(name_f_idx,emu->nombre);
        strcat(name_f_idx, EMUFS_IDX_EXT);
 
-       if ( (f_idx = fopen(name_f_idx,"a+"))==NULL ) return -1;
+       if ( (f_idx = fopen(name_f_idx,"r+"))==NULL ) return -1;
 
        fseek(f_idx, sizeof(EMUFS_IDX)*id_reg, SEEK_SET); 
        reg.id_reg = id_reg;
@@ -214,10 +214,11 @@ EMUFS_REG_ID *emufs_idx_get(EMUFS *emu, EMUFS_REG_ID *cant)
        count = 0;
        while (!feof(f_idx)) {
                if (fread(&reg, sizeof(EMUFS_IDX), 1, f_idx) != 1) continue;
-               count++;
-               /* TODO : Verificar errores :-D */
-               tmp = realloc(tmp, count);
-               tmp[count-1] = reg.id_reg;
+               if (reg.location != EMUFS_NOT_FOUND) {
+                       count++;
+                       tmp = realloc(tmp, count*sizeof(EMUFS_REG_ID));
+                       tmp[count-1] = reg.id_reg;
+               }
        }
        fclose(f_idx);
 
@@ -225,6 +226,10 @@ EMUFS_REG_ID *emufs_idx_get(EMUFS *emu, EMUFS_REG_ID *cant)
        return tmp;
 }
 
+/** @todo FIXME borrar cuando se cambie emufs_gui/registros.c que es el unico
+ * que lo usa.
+ * @deprecated Usar emufs_idx_buscar_registro.
+ */
 int emufs_idx_existe_id(EMUFS *emu, int ID)
 {
        FILE *f_idx;
@@ -263,7 +268,6 @@ int emufs_idx_actualizar(EMUFS *emu, int ID, EMUFS_BLOCK_ID bloque)
                PERR("No se pudo abrir el archivo");
                return -1;
        }
-       printf("actualice el id = %d\n",ID);
        fseek(f_idx,0,SEEK_SET);
        fseek(f_idx,ID*sizeof(EMUFS_IDX),SEEK_SET);
        fread(&reg,sizeof(EMUFS_IDX),1,f_idx);