Mon Aug 29 20:41:22 2011 UTC ()
Use __dead


(joerg)
diff -r1.8 -r1.9 src/dist/bzip2/bzip2recover.c
cvs diff -r1.8 -r1.9 src/dist/bzip2/Attic/bzip2recover.c (expand / switch to unified diff)

--- src/dist/bzip2/Attic/bzip2recover.c 2011/05/24 12:18:03 1.8
+++ src/dist/bzip2/Attic/bzip2recover.c 2011/08/29 20:41:22 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: bzip2recover.c,v 1.8 2011/05/24 12:18:03 joerg Exp $ */ 1/* $NetBSD: bzip2recover.c,v 1.9 2011/08/29 20:41:22 joerg Exp $ */
2 2
3 3
4/*-----------------------------------------------------------*/ 4/*-----------------------------------------------------------*/
5/*--- Block recoverer program for bzip2 ---*/ 5/*--- Block recoverer program for bzip2 ---*/
6/*--- bzip2recover.c ---*/ 6/*--- bzip2recover.c ---*/
7/*-----------------------------------------------------------*/ 7/*-----------------------------------------------------------*/
8 8
9/* ------------------------------------------------------------------ 9/* ------------------------------------------------------------------
10 This file is part of bzip2/libbzip2, a program and library for 10 This file is part of bzip2/libbzip2, a program and library for
11 lossless, block-sorting data compression. 11 lossless, block-sorting data compression.
12 12
13 bzip2/libbzip2 version 1.0.5 of 10 December 2007 13 bzip2/libbzip2 version 1.0.5 of 10 December 2007
14 Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> 14 Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
@@ -102,65 +102,65 @@ static void tooManyBlocks ( Int32 max_ha @@ -102,65 +102,65 @@ static void tooManyBlocks ( Int32 max_ha
102/*---------------------------------------------------*/ 102/*---------------------------------------------------*/
103 103
104#define BZ_HDR_B 0x42 /* 'B' */ 104#define BZ_HDR_B 0x42 /* 'B' */
105#define BZ_HDR_Z 0x5a /* 'Z' */ 105#define BZ_HDR_Z 0x5a /* 'Z' */
106#define BZ_HDR_h 0x68 /* 'h' */ 106#define BZ_HDR_h 0x68 /* 'h' */
107#define BZ_HDR_0 0x30 /* '0' */ 107#define BZ_HDR_0 0x30 /* '0' */
108  108
109 109
110/*---------------------------------------------------*/ 110/*---------------------------------------------------*/
111/*--- I/O errors ---*/ 111/*--- I/O errors ---*/
112/*---------------------------------------------------*/ 112/*---------------------------------------------------*/
113 113
114/*---------------------------------------------*/ 114/*---------------------------------------------*/
115static void readError ( void ) 115__dead static void readError ( void )
116{ 116{
117 fprintf ( stderr, 117 fprintf ( stderr,
118 "%s: I/O error reading `%s', possible reason follows.\n", 118 "%s: I/O error reading `%s', possible reason follows.\n",
119 progName, inFileName ); 119 progName, inFileName );
120 perror ( progName ); 120 perror ( progName );
121 fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n", 121 fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n",
122 progName ); 122 progName );
123 exit ( 1 ); 123 exit ( 1 );
124} 124}
125 125
126 126
127/*---------------------------------------------*/ 127/*---------------------------------------------*/
128static void writeError ( void ) 128__dead static void writeError ( void )
129{ 129{
130 fprintf ( stderr, 130 fprintf ( stderr,
131 "%s: I/O error reading `%s', possible reason follows.\n", 131 "%s: I/O error reading `%s', possible reason follows.\n",
132 progName, inFileName ); 132 progName, inFileName );
133 perror ( progName ); 133 perror ( progName );
134 fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n", 134 fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n",
135 progName ); 135 progName );
136 exit ( 1 ); 136 exit ( 1 );
137} 137}
138 138
139 139
140/*---------------------------------------------*/ 140/*---------------------------------------------*/
141static void mallocFail ( Int32 n ) 141__dead static void mallocFail ( Int32 n )
142{ 142{
143 fprintf ( stderr, 143 fprintf ( stderr,
144 "%s: malloc failed on request for %d bytes.\n", 144 "%s: malloc failed on request for %d bytes.\n",
145 progName, n ); 145 progName, n );
146 fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n", 146 fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n",
147 progName ); 147 progName );
148 exit ( 1 ); 148 exit ( 1 );
149} 149}
150 150
151 151
152/*---------------------------------------------*/ 152/*---------------------------------------------*/
153static void tooManyBlocks ( Int32 max_handled_blocks ) 153__dead static void tooManyBlocks ( Int32 max_handled_blocks )
154{ 154{
155 fprintf ( stderr, 155 fprintf ( stderr,
156 "%s: `%s' appears to contain more than %d blocks\n", 156 "%s: `%s' appears to contain more than %d blocks\n",
157 progName, inFileName, max_handled_blocks ); 157 progName, inFileName, max_handled_blocks );
158 fprintf ( stderr, 158 fprintf ( stderr,
159 "%s: and cannot be handled. To fix, increase\n", 159 "%s: and cannot be handled. To fix, increase\n",
160 progName ); 160 progName );
161 fprintf ( stderr,  161 fprintf ( stderr,
162 "%s: BZ_MAX_HANDLED_BLOCKS in bzip2recover.c, and recompile.\n", 162 "%s: BZ_MAX_HANDLED_BLOCKS in bzip2recover.c, and recompile.\n",
163 progName ); 163 progName );
164 exit ( 1 ); 164 exit ( 1 );
165} 165}
166 166