This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[mainline] PATCH to diagnostic.c: Goodbye xxx_with_file_and_file.


So that these no lonoger exist.

Bootstrapped and regtested on an i686-pc-linux-gnu.

-- Gaby
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ChangeLog,v
retrieving revision 1.17743
diff -p -r1.17743 ChangeLog
*** ChangeLog	9 May 2003 09:25:24 -0000	1.17743
--- ChangeLog	9 May 2003 10:06:07 -0000
***************
*** 1,5 ****
--- 1,12 ----
  2003-05-09  Gabriel Dos Reis <gdr@integrable-solutions.net>
  
+ 	* toplev.h (warning_with_file_and_line): Don't declare.
+ 	(error_with_file_and_line): Likewise.
+ 	* diagnostic.c (error_with_file_and_line): Remove.
+ 	(warning_with_file_and_line): Likewise.
+ 

Index: toplev.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/toplev.h,v
retrieving revision 1.91
diff -p -r1.91 toplev.h
*** toplev.h	4 May 2003 15:18:21 -0000	1.91
--- toplev.h	9 May 2003 10:06:07 -0000
*************** extern void error			PARAMS ((const char 
*** 59,68 ****
  extern void fatal_error			PARAMS ((const char *, ...))
  					       ATTRIBUTE_NORETURN;
  extern void pedwarn			PARAMS ((const char *, ...));
- extern void warning_with_file_and_line	PARAMS ((const char *, int,
- 						 const char *, ...));
- extern void error_with_file_and_line	PARAMS ((const char *, int,
- 						 const char *, ...));
  extern void sorry			PARAMS ((const char *, ...));
  
  extern void rest_of_decl_compilation	PARAMS ((union tree_node *,
--- 59,64 ----
Index: diagnostic.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/diagnostic.c,v
retrieving revision 1.109
diff -p -r1.109 diagnostic.c
*** diagnostic.c	4 May 2003 15:18:21 -0000	1.109
--- diagnostic.c	9 May 2003 10:06:07 -0000
*************** diagnostic_report_current_function (cont
*** 1080,1101 ****
  }
  
  void
- error_with_file_and_line VPARAMS ((const char *file, int line,
- 				   const char *msgid, ...))
- {
-   diagnostic_info diagnostic;
- 
-   VA_OPEN (ap, msgid);
-   VA_FIXEDARG (ap, const char *, file);
-   VA_FIXEDARG (ap, int, line);
-   VA_FIXEDARG (ap, const char *, msgid);
- 
-   diagnostic_set_info (&diagnostic, msgid, &ap, file, line, DK_ERROR);
-   report_diagnostic (&diagnostic);
-   VA_CLOSE (ap);
- }
- 
- void
  error_with_decl VPARAMS ((tree decl, const char *msgid, ...))
  {
    diagnostic_info diagnostic;
--- 1080,1085 ----
*************** internal_error VPARAMS ((const char *msg
*** 1180,1201 ****
  with preprocessed source if appropriate.\n\
  See %s for instructions.\n", bug_report_url);
    exit (FATAL_EXIT_CODE);
- }
- 
- void
- warning_with_file_and_line VPARAMS ((const char *file, int line,
- 				     const char *msgid, ...))
- {
-   diagnostic_info diagnostic;
- 
-   VA_OPEN (ap, msgid);
-   VA_FIXEDARG (ap, const char *, file);
-   VA_FIXEDARG (ap, int, line);
-   VA_FIXEDARG (ap, const char *, msgid);
- 
-   diagnostic_set_info (&diagnostic, msgid, &ap, file, line, DK_WARNING);
-   report_diagnostic (&diagnostic);
-   VA_CLOSE (ap);
  }
  
  void
--- 1164,1169 ----


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]