Merge branch 'master' into squeeze

[debian/amanda] / server-src / tapefile.h

diff --git a/server-src/tapefile.h b/server-src/tapefile.h
index eac09e9a366894f8f55155ebc191e27b2675c660..38148d63503ee5444ea87fe0e70578247bca6f23 100644 (file)
--- a/server-src/tapefile.h
+++ b/server-src/tapefile.h
@@ -40,22 +40,27 @@ typedef struct tape_s {
     char * datestamp;
     int reuse;
     char *label;
+    char *barcode;
+    char *meta;
+    guint64 blocksize;
     char *comment;
 } tape_t;
 
 int read_tapelist(char *tapefile);
 int write_tapelist(char *tapefile);
 void clear_tapelist(void);
-tape_t *lookup_tapelabel(char *label);
+tape_t *lookup_tapelabel(const char *label);
 tape_t *lookup_tapepos(int pos);
 tape_t *lookup_tapedate(char *datestamp);
 int lookup_nb_tape(void);
+char *get_last_reusable_tape_label(int skip);
 tape_t *lookup_last_reusable_tape(int skip);
 void remove_tapelabel(char *label);
 tape_t *add_tapelabel(char *datestamp, char *label, char *comment);
 int reusable_tape(tape_t *tp);
 
 int guess_runs_from_tapelist(void);
+char *list_new_tapes(int nb);
 void print_new_tapes(FILE *output, int nb);
 
 #endif /* !TAPEFILE_H */