On Tue, Jul 19, 2011 at 00:19, Karel Zak <kzak@xxxxxxxxxx> wrote:
> On Thu, Jul 14, 2011 at 05:47:39PM +0200, Sami Kerola wrote:
>> +++ b/include/minix.h
>> @@ -1,69 +1,65 @@
>> #ifndef __MINIX_H__
>> #define __MINIX_H__
>
> we usually use UTIL_LINUX prefix, so #ifndef UTIL_LINUX_MINIX_H.
Changed.
>> #define BLOCK_SIZE_BITS 10
>> #define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
>
> This is too generic. Please, use MINIX_ prefix.
Adding MINIX_ prefix will cause a greater change, but as you wish I did that.
>> #define Inode (((struct minix_inode *) inode_buffer)-1)
>> #define Inode2 (((struct minix2_inode *) inode_buffer)-1)
>>
>> #define INODE_SIZE (sizeof(struct minix_inode))
>> #define INODE2_SIZE (sizeof(struct minix2_inode))
>>
>> -int fs_version = 1; /* this default value needs to change in a near future */
>> -char *super_block_buffer, *inode_buffer = NULL;
>> +static int fs_version = 1; /* this default value needs to change in a
>> near future */
>> +static char *super_block_buffer, *inode_buffer = NULL;
>>
>> static char *inode_map;
>> static char *zone_map;
>
> The global variables don't belong to this generic header file. The
> stuff around inode_buffer, fs_version and the inline functions are
> specific to the disk-utils/ utils. Please, add
> disk-utils/minix_programs.h and use it in {mkfs,fsck}.minix.
Done.
The following changes since commit 872a1575e81f5ed1e871d4ed9558f43effe96423:
dmesg: fix typo in usage() (2011-07-14 13:46:13 +0200)
are available in the git repository at:
https://github.com/kerolasa/lelux-utiliteetit minix
Sami Kerola (7):
include: minix.h: use data types from stdint.h
include: remove kernel headers from minix.h
include: move minix.h to include directory
libblkid: use superblock structure from minix.h
libblkid: use MINIX_BLOCK_SIZE from minix.h
minix: move globals and inline functions to minix_programs.h
libblkid: move MINIX_MAXPARTITIONS to minix.h
disk-utils/Makefile.am | 4 +-
disk-utils/fsck.minix.c | 99 ++++++++++---------
disk-utils/minix.h | 202 --------------------------------------
disk-utils/minix_programs.h | 113 +++++++++++++++++++++
disk-utils/mkfs.minix.c | 77 +++++++-------
include/Makefile.am | 1 +
include/minix.h | 97 ++++++++++++++++++
libblkid/src/partitions/minix.c | 6 +-
libblkid/src/superblocks/minix.c | 33 +------
9 files changed, 304 insertions(+), 328 deletions(-)
delete mode 100644 disk-utils/minix.h
create mode 100644 disk-utils/minix_programs.h
create mode 100644 include/minix.h
--
Sami Kerola
http://www.iki.fi/kerolasa/
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
