Piloteado de mini bug que pudiera existir en insertar ordenado, siempre se devuelve...

[z.facultad/75.06/emufs.git] / emufs / external_sort / mergefile.h

diff --git a/emufs/external_sort/mergefile.h b/emufs/external_sort/mergefile.h
index 1183d14f1b700fab1c3ceadff5617feda6c81c50..221a0559a141fc07100e448b928e42f7e8c2bb9c 100644 (file)
--- a/emufs/external_sort/mergefile.h
+++ b/emufs/external_sort/mergefile.h
@@ -22,7 +22,7 @@
  * Autores: Leandro Lucarella <llucare@fi.uba.ar>
  *----------------------------------------------------------------------------
  *
- * $Id: tipo1.h 542 2004-05-28 19:45:02Z rmarkie $
+ * $Id$
  *
  */
 
@@ -35,33 +35,32 @@
  *
  */
 
-#ifndef _MERGEFILE_H_
-#define _MERGEFILE_H_
+#ifndef _EXTSORT_MERGEFILE_H_
+#define _EXTSORT_MERGEFILE_H_
 
 #include <stdio.h>
 
-#define MERGEFILE_TEMPLATE "sorted_chunk.%i"
-
 typedef struct
 {
        FILE* fp;
-       char* filename;
        int   next;
        int   more;
 }
 MERGEFILE;
 
-char* mergefile_makefilename(int i);
-
-MERGEFILE* mergefile_new(int i);
+MERGEFILE* mergefile_new();
 
 void mergefile_delete(MERGEFILE* mf);
 
-int mergefile_peek_next(MERGEFILE* mf);
+int mergefile_switch_to_input(MERGEFILE* mf);
+
+int mergefile_push(MERGEFILE* mf, int data);
+
+int mergefile_pop(MERGEFILE* mf);
 
-int mergefile_pop_next(MERGEFILE* mf);
+int mergefile_peek(MERGEFILE* mf);
 
 int mergefile_has_more(MERGEFILE* mf);
 
-#endif /* _MERGEFILE_H_ */
+#endif /* _EXTSORT_MERGEFILE_H_ */