Resolve -Wcast-qual issues.

This commit is contained in:
lukem 2009-04-11 11:10:43 +00:00
parent a73e6e5f81
commit eb2de0beef
1 changed files with 16 additions and 16 deletions

32
dist/bzip2/bzip2.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: bzip2.c,v 1.7 2009/04/06 19:33:22 kefren Exp $ */
/* $NetBSD: bzip2.c,v 1.8 2009/04/11 11:10:43 lukem Exp $ */
/*-----------------------------------------------------------*/
@ -220,7 +220,7 @@ static void crcError ( void ) NORETURN;
static void cleanUpAndFail ( Int32 ) NORETURN;
static void compressedStreamEOF ( void ) NORETURN;
static void copyFileName ( Char*, Char* );
static void copyFileName ( Char*, const Char* );
static void* myMalloc ( Int32 );
static void applySavedFileAttrToOutputFile ( IntNative fd );
@ -921,7 +921,7 @@ void pad ( Char *s )
/*---------------------------------------------*/
static
void copyFileName ( Char* to, Char* from )
void copyFileName ( Char* to, const Char* from )
{
if ( strlen(from) > FILE_NAME_LEN-10 ) {
fprintf (
@ -1149,8 +1149,8 @@ void compress ( Char *name )
switch (srcMode) {
case SM_I2O:
copyFileName ( inName, (Char*)"(stdin)" );
copyFileName ( outName, (Char*)"(stdout)" );
copyFileName ( inName, "(stdin)" );
copyFileName ( outName, "(stdout)" );
break;
case SM_F2F:
copyFileName ( inName, name );
@ -1159,7 +1159,7 @@ void compress ( Char *name )
break;
case SM_F2O:
copyFileName ( inName, name );
copyFileName ( outName, (Char*)"(stdout)" );
copyFileName ( outName, "(stdout)" );
break;
}
@ -1333,8 +1333,8 @@ void uncompress ( Char *name )
cantGuess = False;
switch (srcMode) {
case SM_I2O:
copyFileName ( inName, (Char*)"(stdin)" );
copyFileName ( outName, (Char*)"(stdout)" );
copyFileName ( inName, "(stdin)" );
copyFileName ( outName, "(stdout)" );
break;
case SM_F2F:
copyFileName ( inName, name );
@ -1347,7 +1347,7 @@ void uncompress ( Char *name )
break;
case SM_F2O:
copyFileName ( inName, name );
copyFileName ( outName, (Char*)"(stdout)" );
copyFileName ( outName, "(stdout)" );
break;
}
@ -1525,9 +1525,9 @@ void testf ( Char *name )
if (name == NULL && srcMode != SM_I2O)
panic ( "testf: bad modes\n" );
copyFileName ( outName, (Char*)"(none)" );
copyFileName ( outName, "(none)" );
switch (srcMode) {
case SM_I2O: copyFileName ( inName, (Char*)"(stdin)" ); break;
case SM_I2O: copyFileName ( inName, "(stdin)" ); break;
case SM_F2F: copyFileName ( inName, name ); break;
case SM_F2O: copyFileName ( inName, name ); break;
}
@ -1749,7 +1749,7 @@ Cell *snocString ( Cell *root, Char *name )
/*---------------------------------------------*/
static
void addFlagsFromEnvVar ( Cell** argList, Char* varName )
void addFlagsFromEnvVar ( Cell** argList, const Char* varName )
{
Int32 i, j, k;
Char *envbase, *p;
@ -1819,8 +1819,8 @@ IntNative main ( IntNative argc, Char *argv[] )
# endif
#endif
copyFileName ( inName, (Char*)"(none)" );
copyFileName ( outName, (Char*)"(none)" );
copyFileName ( inName, "(none)" );
copyFileName ( outName, "(none)" );
copyFileName ( progNameReally, argv[0] );
progName = &progNameReally[0];
@ -1832,8 +1832,8 @@ IntNative main ( IntNative argc, Char *argv[] )
expand filename wildcards in arg list.
--*/
argList = NULL;
addFlagsFromEnvVar ( &argList, (Char*)"BZIP2" );
addFlagsFromEnvVar ( &argList, (Char*)"BZIP" );
addFlagsFromEnvVar ( &argList, "BZIP2" );
addFlagsFromEnvVar ( &argList, "BZIP" );
for (i = 1; i <= argc-1; i++)
APPEND_FILESPEC(argList, argv[i]);