Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Take a small step toward making vndcompress into a host tool: 

remove #include <arpa/inet.h> and use bswap32() instead of ntohl().
This commit is contained in:
dyoung 2008-02-18 03:34:04 +00:00
parent 146e2f8297
commit 4c39af2f02
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/vndcompress/vndcompress.c
View File

@ -1,4 +1,4 @@
/* $Id: vndcompress.c,v 1.3 2005/07/27 09:29:02 he Exp $ */
/* $Id: vndcompress.c,v 1.4 2008/02/18 03:34:04 dyoung Exp $ */
/*
* Copyright (c) 2005 by Florian Stoehr <netbsd@wolfnode.de>
@ -37,8 +37,6 @@
* vndcompress program - Compress/decompress filesystem images to
* the cloop2 format
*/
#include <arpa/inet.h>
#include <err.h>
#include <fcntl.h>
#include <stdarg.h>
@ -136,8 +134,8 @@ vndcompress(const char *fs, const char *comp, uint32_t blocksize)
memcpy(clh.sh, cloop_sh, strlen(cloop_sh));
/* Remember the header is also in network format! */
clh.block_size = htonl(blocksize);
clh.num_blocks = htonl(total_blocks);
clh.block_size = SWAPPER32(blocksize);
clh.num_blocks = SWAPPER32(total_blocks);
/* Prepare the offset table (unsigned 64-bit big endian offsets) */
offtable_size = (total_blocks + 1) * sizeof(uint64_t);
@ -255,8 +253,8 @@ readheader(int fd, struct cloop_header *clh, off_t *dstart)
return NULL;
/* Convert endianness */
clh->block_size = ntohl(clh->block_size);
clh->num_blocks = ntohl(clh->num_blocks);
clh->block_size = SWAPPER32(clh->block_size);
clh->num_blocks = SWAPPER32(clh->num_blocks);
offtable_size = (clh->num_blocks + 1) * sizeof(uint64_t);
offt = (uint64_t *)malloc(offtable_size);

9
usr.bin/vndcompress/vndcompress.h
View File

@ -1,4 +1,4 @@
/* $Id: vndcompress.h,v 1.1.1.1 2005/07/25 12:17:59 hubertf Exp $ */
/* $Id: vndcompress.h,v 1.2 2008/02/18 03:34:04 dyoung Exp $ */
/*
* Copyright (c) 2005 by Florian Stoehr
@ -66,12 +66,17 @@ void vnduncompress(const char *, const char *);
#define DEF_BLOCKSIZE 128*ATOMBLOCK
/*
* Convert a 64-bit value between network and local byte order
* SWAPPER: Convert a 64-bit value between network and local byte order
* SWAPPER32: Convert a 32-bit value between network and local byte order
*/
#if (_BYTE_ORDER == _BIG_ENDIAN)
#define SWAPPER(arg) (arg)
#define SWAPPER32(arg) (arg)
#define SWAPPER16(arg) (arg)
#else
#define SWAPPER(arg) bswap64(arg)
#define SWAPPER32(arg) bswap32(arg)
#define SWAPPER16(arg) bswap16(arg)
#endif
struct cloop_header {