From a13572a4e8bdf877a2c5fbebdbe4550228b353ba Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Tue, 29 Nov 2005 23:29:17 +0000 Subject: [PATCH] remove max_blocks form container, add it in parameters, add real file size in container --- libemile/emile_scsi_create_container.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libemile/emile_scsi_create_container.c b/libemile/emile_scsi_create_container.c index 33c10f1..6e4b0fd 100644 --- a/libemile/emile_scsi_create_container.c +++ b/libemile/emile_scsi_create_container.c @@ -1,4 +1,3 @@ -static __attribute__((used)) char* rcsid = "$CVSHeader$"; /* * * (c) 2004 Laurent Vivier @@ -96,13 +95,13 @@ static int get_device_info(int fd, int *id, unsigned long *first_block, container->blocks[current].offset = (a); \ container->blocks[current].count = (b); \ current++; \ - if (current > container->max_blocks) \ + if (current > maxblocks) \ { \ fprintf(stderr, "Container overflow\n");\ return -1; \ } -int emile_scsi_create_container(int fd, struct emile_container* container) +int emile_scsi_create_container(int fd, struct emile_container* container, int maxblocks) { int ret; struct stat st; @@ -128,8 +127,8 @@ int emile_scsi_create_container(int fd, struct emile_container* container) if (ret != 0) return -1; + container->size = st.st_size; container->unit_id = (u_int16_t)id; - container->block_size = (u_int16_t)sector_size; /* get filesystem block size */