egcs CVS 19980621, warning patch part 4/7

[Kaveh R. Ghazi]

	This is warning patch part 4/7.  Okay to install?



Sun Jun 21 16:39:30 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

	* call.c (build_scoped_method_call): Remove unused variable `tmp'.

	* cp-tree.h (check_dtor_name): Add prototype.

	* init.c (expand_member_init): Remove unused variables
	`ptr_type_node', `parm' and `rval'.

	* ptree.c (print_lang_type): Use HOST_WIDE_INT_PRINT_DEC specifier
	in call to fprintf.
	(lang_print_xnode): Likewise.

	* typeck2.c (enum_name_string): Cast argument to sprintf to long
	and use %ld specifier.

	* xref.c (GNU_xref_end_scope): Use HOST_WIDE_INT_PRINT_DEC
	specifier in call to fprintf.
	(GNU_xref_member): Cast argument to sprintf to int.


diff -rup orig/egcs-CVS19980621/gcc/cp/call.c egcs-CVS19980621/gcc/cp/call.c
--- orig/egcs-CVS19980621/gcc/cp/call.c	Sun Jun 21 08:43:24 1998
+++ egcs-CVS19980621/gcc/cp/call.c	Sun Jun 21 11:37:13 1998
@@ -384,7 +384,6 @@ build_scoped_method_call (exp, basetype,
      @@ But we do have to check access privileges later.  */
   tree binfo, decl;
   tree type = TREE_TYPE (exp);
-  tree tmp;
 
   if (type == error_mark_node
       || basetype == error_mark_node)
diff -rup orig/egcs-CVS19980621/gcc/cp/cp-tree.h egcs-CVS19980621/gcc/cp/cp-tree.h
--- orig/egcs-CVS19980621/gcc/cp/cp-tree.h	Sun Jun 21 08:43:23 1998
+++ egcs-CVS19980621/gcc/cp/cp-tree.h	Sun Jun 21 11:33:39 1998
@@ -2236,6 +2236,7 @@ extern tree current_class_type;	/* _TYPE
 extern char **opname_tab, **assignop_tab;
 
 /* in call.c */
+extern int check_dtor_name			PROTO((tree, tree));
 extern int get_arglist_len_in_bytes		PROTO((tree));
 
 extern tree build_vfield_ref			PROTO((tree, tree));
diff -rup orig/egcs-CVS19980621/gcc/cp/init.c egcs-CVS19980621/gcc/cp/init.c
--- orig/egcs-CVS19980621/gcc/cp/init.c	Sun Jun 21 08:43:30 1998
+++ egcs-CVS19980621/gcc/cp/init.c	Sun Jun 21 11:38:49 1998
@@ -904,11 +904,8 @@ void
 expand_member_init (exp, name, init)
      tree exp, name, init;
 {
-  extern tree ptr_type_node;	/* should be in tree.h */
-
   tree basetype = NULL_TREE, field;
-  tree parm;
-  tree rval = NULL_TREE, type;
+  tree type;
 
   if (exp == NULL_TREE)
     return;			/* complain about this later */
diff -rup orig/egcs-CVS19980621/gcc/cp/ptree.c egcs-CVS19980621/gcc/cp/ptree.c
--- orig/egcs-CVS19980621/gcc/cp/ptree.c	Sun Jun 21 08:43:36 1998
+++ egcs-CVS19980621/gcc/cp/ptree.c	Sun Jun 21 14:07:18 1998
@@ -70,9 +70,12 @@ print_lang_type (file, node, indent)
       || TREE_CODE (node) == TEMPLATE_TEMPLATE_PARM)
     {
       indent_to (file, indent + 3);
-      fprintf (file, "index %d level %d orig_level %d",
-	       TEMPLATE_TYPE_IDX (node), TEMPLATE_TYPE_LEVEL (node),
-	       TEMPLATE_TYPE_ORIG_LEVEL (node));
+      fputs ("index ", file);
+      fprintf (file, HOST_WIDE_INT_PRINT_DEC, TEMPLATE_TYPE_IDX (node));
+      fputs (" level ", file);
+      fprintf (file, HOST_WIDE_INT_PRINT_DEC, TEMPLATE_TYPE_LEVEL (node));
+      fputs (" orig_level ", file);
+      fprintf (file, HOST_WIDE_INT_PRINT_DEC, TEMPLATE_TYPE_ORIG_LEVEL (node));
       return;
     }
 
@@ -175,9 +178,12 @@ lang_print_xnode (file, node, indent)
       break;
     case TEMPLATE_PARM_INDEX:
       indent_to (file, indent + 3);
-      fprintf (file, "index %d level %d orig_level %d",
-	       TEMPLATE_PARM_IDX (node), TEMPLATE_PARM_LEVEL (node),
-	       TEMPLATE_PARM_ORIG_LEVEL (node));
+      fputs ("index ", file);
+      fprintf (file, HOST_WIDE_INT_PRINT_DEC, TEMPLATE_PARM_IDX (node));
+      fputs (" level ", file);
+      fprintf (file, HOST_WIDE_INT_PRINT_DEC, TEMPLATE_PARM_LEVEL (node));
+      fputs (" orig_level ", file);
+      fprintf (file, HOST_WIDE_INT_PRINT_DEC, TEMPLATE_PARM_ORIG_LEVEL (node));
       break;
     default:
       break;
diff -rup orig/egcs-CVS19980621/gcc/cp/typeck2.c egcs-CVS19980621/gcc/cp/typeck2.c
--- orig/egcs-CVS19980621/gcc/cp/typeck2.c	Sun Jun 21 08:43:40 1998
+++ egcs-CVS19980621/gcc/cp/typeck2.c	Sun Jun 21 14:01:10 1998
@@ -1530,8 +1530,8 @@ enum_name_string (value, type)
       char *buf = (char *)oballoc (16 + TYPE_NAME_LENGTH (type));
 
       /* Value must have been cast.  */
-      sprintf (buf, "(enum %s)%d",
-	       TYPE_NAME_STRING (type), intval);
+      sprintf (buf, "(enum %s)%ld",
+	       TYPE_NAME_STRING (type), (long) intval);
       return buf;
     }
   return IDENTIFIER_POINTER (TREE_PURPOSE (values));
diff -rup orig/egcs-CVS19980621/gcc/cp/xref.c egcs-CVS19980621/gcc/cp/xref.c
--- orig/egcs-CVS19980621/gcc/cp/xref.c	Sun Jun 21 08:43:40 1998
+++ egcs-CVS19980621/gcc/cp/xref.c	Sun Jun 21 14:09:22 1998
@@ -286,8 +286,10 @@ GNU_xref_end_scope (id,inid,prm,keep)
   else if (keep == 2 || inid != 0) stype = "INTERN";
   else stype = "EXTERN";
 
-  fprintf (xref_file,"SCP %s %d %d %d %d %s\n",
-	   filename (xf), xs->start, lineno,xs->lid, inid, stype);
+  fprintf (xref_file, "SCP %s %d %d %d ",
+	   filename (xf), xs->start, lineno,xs->lid);
+  fprintf (xref_file, HOST_WIDE_INT_PRINT_DEC, inid);
+  fprintf (xref_file, " %s\n", stype);
 
   if (lxs == NULL) cur_scope = xs->outer;
   else lxs->outer = xs->outer;
diff -rup orig/egcs-CVS19980621/gcc/cp/xref.c egcs-CVS19980621/gcc/cp/xref.c
--- orig/egcs-CVS19980621/gcc/cp/xref.c	Sun Jun 21 08:43:40 1998
+++ egcs-CVS19980621/gcc/cp/xref.c	Sun Jun 21 18:03:24 1998
@@ -601,7 +601,7 @@ GNU_xref_member(cls, fld)
     pure = 1;
 
   d = IDENTIFIER_POINTER(cls);
-  sprintf(buf, "%d%s", strlen(d), d);
+  sprintf(buf, "%d%s", (int) strlen(d), d);
 #ifdef XREF_SHORT_MEMBER_NAMES
   i = strlen(buf);
 #endif