Module Name: src
Committed By: joerg
Date: Tue Sep 6 18:45:04 UTC 2011
Modified Files:
src/usr.bin/vndcompress: vndcompress.c vndcompress.h
Log Message:
Use static and __dead
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/vndcompress/vndcompress.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/vndcompress/vndcompress.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/vndcompress/vndcompress.c
diff -u src/usr.bin/vndcompress/vndcompress.c:1.6 src/usr.bin/vndcompress/vndcompress.c:1.7
--- src/usr.bin/vndcompress/vndcompress.c:1.6 Tue Apr 14 07:36:16 2009
+++ src/usr.bin/vndcompress/vndcompress.c Tue Sep 6 18:45:04 2011
@@ -1,4 +1,4 @@
-/* $Id: vndcompress.c,v 1.6 2009/04/14 07:36:16 lukem Exp $ */
+/* $Id: vndcompress.c,v 1.7 2011/09/06 18:45:04 joerg Exp $ */
/*
* Copyright (c) 2005 by Florian Stoehr <net...@wolfnode.de>
@@ -60,12 +60,12 @@
*/
static const char *cloop_sh = "#!/bin/sh\n" "#V2.0 Format\n" "insmod cloop.o file=$0 && mount -r -t iso9660 /dev/cloop $1\n" "exit $?\n";
-int opmode;
+static int opmode;
/*
* Print usage information, then exit program
*/
-void
+__dead static void
usage(void)
{
if (opmode == OM_COMPRESS) {
@@ -80,7 +80,7 @@
/*
* Compress a given file system
*/
-void
+static void
vndcompress(const char *fs, const char *comp, uint32_t blocksize)
{
int fd_in, fd_out;
@@ -243,7 +243,7 @@
/*
* Read in header and offset table from compressed image
*/
-uint64_t *
+static uint64_t *
readheader(int fd, struct cloop_header *clh, off_t *dstart)
{
uint32_t offtable_size;
@@ -273,7 +273,7 @@
/*
* Decompress a given file system image
*/
-void
+static void
vnduncompress(const char *comp, const char *fs)
{
int fd_in, fd_out;
Index: src/usr.bin/vndcompress/vndcompress.h
diff -u src/usr.bin/vndcompress/vndcompress.h:1.2 src/usr.bin/vndcompress/vndcompress.h:1.3
--- src/usr.bin/vndcompress/vndcompress.h:1.2 Mon Feb 18 03:34:04 2008
+++ src/usr.bin/vndcompress/vndcompress.h Tue Sep 6 18:45:04 2011
@@ -1,4 +1,4 @@
-/* $Id: vndcompress.h,v 1.2 2008/02/18 03:34:04 dyoung Exp $ */
+/* $Id: vndcompress.h,v 1.3 2011/09/06 18:45:04 joerg Exp $ */
/*
* Copyright (c) 2005 by Florian Stoehr
@@ -51,11 +51,6 @@
struct cloop_header;
-void usage(void);
-void vndcompress(const char *, const char *, uint32_t);
-uint64_t * readheader(int, struct cloop_header *, off_t *);
-void vnduncompress(const char *, const char *);
-
/* Size of the shell command (Linux compatibility) */
#define CLOOP_SH_SIZE 128
