ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cramfs: remove cramfs_common.h 

We currently have cramfs.h and cramfs_common.h, this makes no sense, so remove
unite them and keep just cramfs.h

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
This commit is contained in:
Davidlohr Bueso 2011-05-11 13:16:00 -04:00 committed by Karel Zak
parent 1b9b57ace5
commit 06f2558508
6 changed files with 32 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disk-utils/Makefile.am
View File

@ -60,7 +60,7 @@ endif
endif
if BUILD_CRAMFS
cramfs_common = $(utils_common) cramfs.h cramfs_common.c cramfs_common.h
cramfs_common = $(utils_common) cramfs.h cramfs_common.c
sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
fsck_cramfs_SOURCES = fsck.cramfs.c $(cramfs_common)
mkfs_cramfs_SOURCES = mkfs.cramfs.c $(cramfs_common) $(top_srcdir)/lib/md5.c

30
disk-utils/cramfs.h
View File

@ -1,3 +1,21 @@
/*
* cramfs_common - cramfs common code
*
* Copyright (c) 2008 Roy Peled, the.roy.peled -at- gmail
* Copyright (c) 2004-2006 by Michael Holzt, kju -at- fqdn.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __CRAMFS_H
#define __CRAMFS_H
@ -19,6 +37,13 @@ typedef unsigned int u32;
#define CRAMFS_NAMELEN_WIDTH 6
#define CRAMFS_OFFSET_WIDTH 26
#ifndef HOST_IS_BIG_ENDIAN
#ifdef WORDS_BIGENDIAN
#define HOST_IS_BIG_ENDIAN 1
#else
#define HOST_IS_BIG_ENDIAN 0
#endif
#endif
/*
* Reasonably terse representation of the inode data.
@ -78,4 +103,9 @@ int cramfs_uncompress_block(void *dst, int dstlen, void *src, int srclen);
int cramfs_uncompress_init(void);
int cramfs_uncompress_exit(void);
u32 u32_toggle_endianness(int big_endian, u32 what);
void super_toggle_endianness(int from_big_endian, struct cramfs_super *super);
void inode_to_host(int from_big_endian, struct cramfs_inode *inode_in, struct cramfs_inode *inode_out);
void inode_from_host(int to_big_endian, struct cramfs_inode *inode_in, struct cramfs_inode *inode_out);
#endif

2
disk-utils/cramfs_common.c
View File

@ -17,7 +17,7 @@
*/
#include <string.h>
#include "cramfs_common.h"
#include "cramfs.h"
#include "../include/bitops.h"
u32 u32_toggle_endianness(int big_endian, u32 what)

37
disk-utils/cramfs_common.h
View File

@ -1,37 +0,0 @@
/*
* cramfs_common - cramfs common code
*
* Copyright (c) 2008 Roy Peled, the.roy.peled -at- gmail
* Copyright (c) 2004-2006 by Michael Holzt, kju -at- fqdn.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __CRAMFS_COMMON_H
#define __CRAMFS_COMMON_H
#include "cramfs.h"
#ifndef HOST_IS_BIG_ENDIAN
#ifdef WORDS_BIGENDIAN
#define HOST_IS_BIG_ENDIAN 1
#else
#define HOST_IS_BIG_ENDIAN 0
#endif
#endif
u32 u32_toggle_endianness(int big_endian, u32 what);
void super_toggle_endianness(int from_big_endian, struct cramfs_super *super);
void inode_to_host(int from_big_endian, struct cramfs_inode *inode_in, struct cramfs_inode *inode_out);
void inode_from_host(int to_big_endian, struct cramfs_inode *inode_in, struct cramfs_inode *inode_out);
#endif

1
disk-utils/fsck.cramfs.c
View File

@ -54,7 +54,6 @@
#include <sys/sysmacros.h> /* for major, minor */
#include "cramfs.h"
#include "cramfs_common.h"
#include "nls.h"
#include "blkdev.h"

1
disk-utils/mkfs.cramfs.c
View File

@ -38,7 +38,6 @@
#include <zlib.h>
#include "cramfs.h"
#include "cramfs_common.h"
#include "md5.h"
#include "nls.h"
#include "mkfs.h"