Small tidy up patch for bjam (removes some warnings)

From: Kevin Wheatley (hxpro_at_[hidden])
Date: 2005-10-12 07:23:16

When building bjam under mipspro you get a bunch of warnings, attached
is a patch to get rid of the unused/unreferenced variables or move
them into #defines as required by the surrounding code.

This just leaves the follwoing:

hash.c:
cc-1009 cc: WARNING File = hash.c, Line = 313
A "/*" appears inside a comment.

hp->inel = /* */ 11 /*/ 47 /* */;
^
newstr.c:
cc-1009 cc: WARNING File = newstr.c, Line = 63
A "/*" appears inside a comment.

/* */
^

Which personally I don't like but it could be a style choice...

Kevin

-- 
| Kevin Wheatley, Cinesite (Europe) Ltd | Nobody thinks this |
| Senior Technology | My employer for certain |
| And Network Systems Architect | Not even myself | --------------C0CB03DCE5F34E9EFC849651 Content-Type: text/plain; charset=us-ascii;
name="bjam_src_remove_unused_warnings.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="bjam_src_remove_unused_warnings.diff"
Index: builtins.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/builtins.c,v
retrieving revision 1.46
diff -u -p -r1.46 builtins.c
--- builtins.c	3 Oct 2005 00:47:36 -0000	1.46
+++ builtins.c	12 Oct 2005 12:21:48 -0000
@@ -152,12 +152,8 @@ load_builtins()
bind_builtin( "TEMPORARY" ,
builtin_flags, T_FLAG_TEMP, 0 ) );
- {
- char * args[] = { "targets", "*", 0 };
- bind_builtin(
- "ISFILE",
- builtin_flags, T_FLAG_ISFILE, 0 );
- }
+ bind_builtin( "ISFILE",
+ builtin_flags, T_FLAG_ISFILE, 0 );
duplicate_rule( "HdrMacro" ,
bind_builtin( "HDRMACRO" ,
@@ -1325,7 +1321,6 @@ LIST *builtin_normalize_path( PARSE *par
*(current+2) = '\1'; 
++dotdots;
} else if (dotdots) {
- char* p = current;
memset(current, '\1', end-current+1);
--dotdots;
} 
Index: compile.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/compile.c,v
retrieving revision 1.34
diff -u -p -r1.34 compile.c
--- compile.c	3 Oct 2005 00:47:36 -0000	1.34
+++ compile.c	12 Oct 2005 12:21:48 -0000
@@ -799,12 +799,12 @@ collect_arguments( RULE* rule, FRAME* fr
return locals;
}
-static int python_instance_number = 0;
-
RULE *
enter_rule( char *rulename, module_t *target_module );
#ifdef HAVE_PYTHON
+static int python_instance_number = 0;
+
static LIST*
call_python_function(RULE* r, FRAME* frame)
{
Index: fileunix.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/fileunix.c,v
retrieving revision 1.14
diff -u -p -r1.14 fileunix.c
--- fileunix.c	3 Oct 2005 00:47:36 -0000	1.14
+++ fileunix.c	12 Oct 2005 12:21:48 -0000
@@ -173,8 +173,6 @@ file_dirscan( 
string_new( filename );
while( dirent = readdir( dd ) )
{
- file_info_t * ff = 0;
- 
# ifdef old_sinix
/* Broken structure definition on sinix. */
f.f_base.ptr = dirent->d_name - 2;
Index: hash.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/hash.c,v
retrieving revision 1.5
diff -u -p -r1.5 hash.c
--- hash.c	3 Oct 2005 00:47:36 -0000	1.5
+++ hash.c	12 Oct 2005 12:21:48 -0000
@@ -104,7 +104,6 @@ hash_free(
HASHDATA *data)
{
ITEM **prev;
-	register ITEM **i;
unsigned char *b = (unsigned char*)data->key;
unsigned int keyval;
Index: headers.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/headers.c,v
retrieving revision 1.6
diff -u -p -r1.6 headers.c
--- headers.c	1 Jun 2004 05:42:35 -0000	1.6
+++ headers.c	12 Oct 2005 12:21:48 -0000
@@ -60,7 +60,9 @@ headers( TARGET *t )
{
LIST	*hdrscan;
LIST	*hdrrule;
+#ifndef OPT_HEADER_CACHE_EXT
LIST	*headlist = 0;
+#endif
regexp	*re[ MAXINC ];
int	rec = 0;
Index: make.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/make.c,v
retrieving revision 1.18
diff -u -p -r1.18 make.c
--- make.c	12 Feb 2005 02:30:16 -0000	1.18
+++ make.c	12 Oct 2005 12:21:48 -0000
@@ -247,7 +247,7 @@ make0( 
COUNTS	*counts,	/* for reporting */
int	anyhow )	/* forcibly touch all (real) targets */
{
-	TARGETS	*c, *d, *incs;
+	TARGETS	*c, *incs;
TARGET *ptime = t;
time_t	last, leaf, hlast;
int	fate;
Index: rules.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/rules.c,v
retrieving revision 1.22
diff -u -p -r1.22 rules.c
--- rules.c	3 Oct 2005 00:47:36 -0000	1.22
+++ rules.c	12 Oct 2005 12:21:48 -0000
@@ -347,8 +347,6 @@ targetchain( 
TARGETS	*chain,
TARGETS	*targets )
{
-	TARGETS *c;
-
if( !targets )
return chain;
else if( !chain )
Index: timestamp.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/timestamp.c,v
retrieving revision 1.7
diff -u -p -r1.7 timestamp.c
--- timestamp.c	3 Oct 2005 00:47:36 -0000	1.7
+++ timestamp.c	12 Oct 2005 12:21:48 -0000
@@ -76,10 +76,10 @@ timestamp( 
PATHNAME f1, f2;
BINDING	binding, *b = &binding;
string buf[1];
- string path; 
-	char *p;
# ifdef DOWNSHIFT_PATHS
+ string path; 
+	char *p;
string_copy( &path, target );
p = path.value;
Index: modules/order.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/modules/order.c,v
retrieving revision 1.5
diff -u -p -r1.5 order.c
--- modules/order.c	3 Oct 2005 00:47:36 -0000	1.5
+++ modules/order.c	12 Oct 2005 12:21:48 -0000
@@ -80,7 +80,7 @@ LIST *order( PARSE *parse, FRAME *frame 
LIST* arg = lol_get( frame->args, 0 ); 
LIST* tmp;
LIST* result = 0;
- int src, dst;
+ int src;
/* We need to create a graph of order dependencies between
the passed objects. We assume that there are no duplicates
Index: modules/property-set.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/modules/property-set.c,v
retrieving revision 1.7
diff -u -p -r1.7 property-set.c
--- modules/property-set.c	28 Sep 2005 14:09:58 -0000	1.7
+++ modules/property-set.c	12 Oct 2005 12:21:48 -0000
@@ -45,7 +45,9 @@ LIST *property_set_create( PARSE *parse,
{
LIST* properties = lol_get( frame->args, 0 ); 
LIST* sorted = 0;
+#if 0
LIST* order_sensitive = 0;
+#endif
LIST* unique;
LIST* tmp;
LIST* val;
 --------------C0CB03DCE5F34E9EFC849651--