提交: 3e32dddbcfcf22faac2d870780f57b870b6e8001 - groff-psbb (git)

Demonstration of groff .psbb request handling code, for EPS and PDF input files

Commit MetaInfo

• 修訂: 3e32dddbcfcf22faac2d870780f57b870b6e8001 (tree)
• 時間: 2017-10-07 18:53:40
• 作者: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Add a printf-alike API entry for libgroff error reporting.

* libgroff/error.h (errprintf): New function; add prototype.
* libgroff/error.cpp (do_error_with_file_and_line): Factor out...
(report_file_and_line, end_error_with_file_and_line): ...this pair of
initial and final fragments, respectively; incorporate them with...
(do_printf_with_file_and_line): ...this new function; hence...
(do_printf, errprintf): ...implement these.

Change Summary

• modified: libgroff/error.cpp
• modified: libgroff/error.h

差異

--- a/libgroff/error.cpp
+++ b/libgroff/error.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989-2014  Free Software Foundation, Inc.
+/* Copyright (C) 1989-2014, 2017,  Free Software Foundation, Inc.
      Written by James Clark ([e-mail])
 
 This file is part of groff.
@@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 #include <stdio.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include "errarg.h"
@@ -27,14 +28,10 @@ extern void fatal_error_exit();
 
 enum error_type { WARNING, ERROR, FATAL };
 
-static void do_error_with_file_and_line(const char *filename,
-					const char *source_filename,
-					int lineno,
-					error_type type, 
-					const char *format, 
-					const errarg &arg1,
-					const errarg &arg2,
-					const errarg &arg3)
+static void report_file_and_line(const char *filename,
+				 const char *source_filename,
+			 	 int lineno,
+		 		 error_type type)
 {
   int need_space = 0;
   if (program_name) {
@@ -64,16 +61,33 @@ static void do_error_with_file_and_line(const char *filename,
   }
   if (need_space)
     fputc(' ', stderr);
-  errprint(format, arg1, arg2, arg3);
+}
+
+static void end_error_with_file_and_line(error_type type)
+{
   fputc('\n', stderr);
   fflush(stderr);
   if (type == FATAL)
     fatal_error_exit();
 }
-      
 
-static void do_error(error_type type, 
-		     const char *format, 
+static void do_error_with_file_and_line(const char *filename,
+					const char *source_filename,
+					int lineno,
+					error_type type,
+					const char *format,
+					const errarg &arg1,
+					const errarg &arg2,
+					const errarg &arg3)
+{
+  report_file_and_line(filename, source_filename, lineno, type);
+  errprint(format, arg1, arg2, arg3);
+  end_error_with_file_and_line(type);
+}
+
+
+static void do_error(error_type type,
+		     const char *format,
 		     const errarg &arg1,
 		     const errarg &arg2,
 		     const errarg &arg3)
@@ -82,8 +96,27 @@ static void do_error(error_type type,
 			      current_lineno, type, format, arg1, arg2, arg3);
 }
 
+static void do_printf_with_file_and_line(const char *filename,
+					 const char *source_filename,
+					 int lineno,
+					 error_type type,
+					 const char *format,
+					 va_list argv)
+{
+  report_file_and_line(filename, source_filename, lineno, type);
+  vfprintf(stderr, format, argv);
+}
 
-void error(const char *format, 
+static void do_printf(error_type type,
+		      const char *format,
+		      va_list argv)
+{
+  do_printf_with_file_and_line(current_filename, current_source_filename,
+			       current_lineno, type, format, argv);
+}
+
+
+void error(const char *format,
 	   const errarg &arg1,
 	   const errarg &arg2,
 	   const errarg &arg3)
@@ -91,7 +124,7 @@ void error(const char *format,
   do_error(ERROR, format, arg1, arg2, arg3);
 }
 
-void warning(const char *format, 
+void warning(const char *format,
 	     const errarg &arg1,
 	     const errarg &arg2,
 	     const errarg &arg3)
@@ -99,7 +132,7 @@ void warning(const char *format,
   do_error(WARNING, format, arg1, arg2, arg3);
 }
 
-void fatal(const char *format, 
+void fatal(const char *format,
 	   const errarg &arg1,
 	   const errarg &arg2,
 	   const errarg &arg3)
@@ -109,33 +142,42 @@ void fatal(const char *format,
 
 void error_with_file_and_line(const char *filename,
 			      int lineno,
-			      const char *format, 
+			      const char *format,
 			      const errarg &arg1,
 			      const errarg &arg2,
 			      const errarg &arg3)
 {
-  do_error_with_file_and_line(filename, 0, lineno, 
+  do_error_with_file_and_line(filename, 0, lineno,
 			      ERROR, format, arg1, arg2, arg3);
 }
 
 void warning_with_file_and_line(const char *filename,
 				int lineno,
-				const char *format, 
+				const char *format,
 				const errarg &arg1,
 				const errarg &arg2,
 				const errarg &arg3)
 {
-  do_error_with_file_and_line(filename, 0, lineno, 
+  do_error_with_file_and_line(filename, 0, lineno,
 			      WARNING, format, arg1, arg2, arg3);
 }
 
 void fatal_with_file_and_line(const char *filename,
 			      int lineno,
-			      const char *format, 
+			      const char *format,
 			      const errarg &arg1,
 			      const errarg &arg2,
 			      const errarg &arg3)
 {
-  do_error_with_file_and_line(filename, 0, lineno, 
+  do_error_with_file_and_line(filename, 0, lineno,
 			      FATAL, format, arg1, arg2, arg3);
 }
+
+void errprintf(const char *format, ...)
+{
+  va_list argv;
+  va_start(argv, format);
+  do_printf(ERROR, format, argv);
+  va_end(argv);
+  end_error_with_file_and_line(ERROR);
+}

--- a/libgroff/error.h
+++ b/libgroff/error.h
@@ -50,6 +50,7 @@ extern void warning(const char *,
 		    const errarg &arg2 = empty_errarg,
 		    const errarg &arg3 = empty_errarg);
 
+extern "C" void errprintf(const char *, ...);
 
 extern "C" const char *program_name;
 extern int current_lineno;