Remove the error callback data pointer as none of the frontends make use of it.

13 files changed, 22 insertions, 25 deletions

diff --git a/cpp/poppler-document.cpp b/cpp/poppler-document.cpp
index 15b83454..c62fe80b 100644
--- a/cpp/poppler-document.cpp
+++ b/cpp/poppler-document.cpp
@@ -85,7 +85,7 @@ document_private::document_private(const char *file_data, int file_data_length,
 }
 
 document_private::document_private()
-    : GlobalParamsIniter(detail::error_function, nullptr)
+    : GlobalParamsIniter(detail::error_function)
     , doc(nullptr)
     , raw_doc_data(nullptr)
     , raw_doc_data_length(0)
diff --git a/cpp/poppler-private.cpp b/cpp/poppler-private.cpp
index a532b350..4eb360fd 100644
--- a/cpp/poppler-private.cpp
+++ b/cpp/poppler-private.cpp
@@ -40,7 +40,7 @@ static void stderr_debug_function(const std::string &msg, void * /*data*/)
 debug_func detail::user_debug_function = stderr_debug_function;
 void *detail::debug_closure = nullptr;
 
-void detail::error_function(void * /*data*/, ErrorCategory /*category*/, Goffset pos, const char *msg)
+void detail::error_function(ErrorCategory /*category*/, Goffset pos, const char *msg)
 {
     std::ostringstream oss;
     if (pos >= 0) {
diff --git a/cpp/poppler-private.h b/cpp/poppler-private.h
index 7f2ca383..b5f6599e 100644
--- a/cpp/poppler-private.h
+++ b/cpp/poppler-private.h
@@ -47,7 +47,7 @@ namespace detail
 
 extern debug_func user_debug_function;
 extern void *debug_closure;
-void error_function(void *data, ErrorCategory category, Goffset pos, const char *msg);
+void error_function(ErrorCategory category, Goffset pos, const char *msg);
 
 rectf pdfrectangle_to_rectf(const PDFRectangle &pdfrect);
 
diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
index 26621365..6615334c 100644
--- a/glib/poppler-document.cc
+++ b/glib/poppler-document.cc
@@ -193,7 +193,7 @@ poppler_document_new_from_file (const char  *uri,
   GooString *password_g;
   char *filename;
 
-  auto initer = new GlobalParamsIniter(_poppler_error_cb, nullptr);
+  auto initer = new GlobalParamsIniter(_poppler_error_cb);
 
   filename = g_filename_from_uri (uri, nullptr, error);
   if (!filename)
@@ -253,7 +253,7 @@ poppler_document_new_from_data (char        *data,
   MemStream *str;
   GooString *password_g;
 
-  auto initer = new GlobalParamsIniter(_poppler_error_cb, nullptr);
+  auto initer = new GlobalParamsIniter(_poppler_error_cb);
   
   // create stream
   str = new MemStream(data, 0, length, Object(objNull));
@@ -305,7 +305,7 @@ poppler_document_new_from_bytes (GBytes      *bytes,
   g_return_val_if_fail(bytes != nullptr, nullptr);
   g_return_val_if_fail(error == nullptr || *error == nullptr, nullptr);
 
-  auto initer = new GlobalParamsIniter(_poppler_error_cb, nullptr);
+  auto initer = new GlobalParamsIniter(_poppler_error_cb);
 
   // create stream
   str = new BytesStream(bytes, Object(objNull));
@@ -356,7 +356,7 @@ poppler_document_new_from_stream (GInputStream *stream,
   g_return_val_if_fail(G_IS_INPUT_STREAM(stream), NULL);
   g_return_val_if_fail(length == (goffset)-1 || length > 0, NULL);
 
-  auto initer = new GlobalParamsIniter(_poppler_error_cb, nullptr);
+  auto initer = new GlobalParamsIniter(_poppler_error_cb);
 
   if (!G_IS_SEEKABLE(stream) || !g_seekable_can_seek(G_SEEKABLE(stream))) {
     g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
diff --git a/glib/poppler-private.h b/glib/poppler-private.h
index cba1de76..86b587fd 100644
--- a/glib/poppler-private.h
+++ b/glib/poppler-private.h
@@ -163,6 +163,6 @@ type_name##_get_type (void)
 	return g_define_type_id__volatile;                                            \
 }
 
-void _poppler_error_cb (void *data, ErrorCategory category, Goffset pos, const char *message);
+void _poppler_error_cb (ErrorCategory category, Goffset pos, const char *message);
 
 #endif
diff --git a/glib/poppler.cc b/glib/poppler.cc
index 31183372..5fffcbbb 100644
--- a/glib/poppler.cc
+++ b/glib/poppler.cc
@@ -84,8 +84,7 @@ poppler_get_version (void)
  */
 
 void
-_poppler_error_cb (void *data G_GNUC_UNUSED,
-                   ErrorCategory category,
+_poppler_error_cb (ErrorCategory category,
                    Goffset pos,
                    const char *message)
 {
diff --git a/poppler/Error.cc b/poppler/Error.cc
index f38666da..f161c4d7 100644
--- a/poppler/Error.cc
+++ b/poppler/Error.cc
@@ -46,11 +46,9 @@ static const char *errorCategoryNames[] = {
 };
 
 static ErrorCallback errorCbk = nullptr;
-static void *errorCbkData = nullptr;
 
-void setErrorCallback(ErrorCallback cbk, void *data) {
+void setErrorCallback(ErrorCallback cbk) {
   errorCbk = cbk;
-  errorCbkData = data;
 }
 
 void CDECL error(ErrorCategory category, Goffset pos, const char *msg, ...) {
@@ -76,7 +74,7 @@ void CDECL error(ErrorCategory category, Goffset pos, const char *msg, ...) {
   }
 
   if (errorCbk) {
-    (*errorCbk)(errorCbkData, category, pos, sanitized->c_str());
+    (*errorCbk)(category, pos, sanitized->c_str());
   } else {
     if (pos >= 0) {
       fprintf(stderr, "%s (%lld): %s\n",
diff --git a/poppler/Error.h b/poppler/Error.h
index 52ac80f0..22329c7e 100644
--- a/poppler/Error.h
+++ b/poppler/Error.h
@@ -47,9 +47,9 @@ enum ErrorCategory {
   errInternal          // internal error - malfunction within the Xpdf code
 };
 
-using ErrorCallback = void (*)(void *data, ErrorCategory category, Goffset pos, const char *msg);
+using ErrorCallback = void (*)(ErrorCategory category, Goffset pos, const char *msg);
 
-extern void setErrorCallback(ErrorCallback cbk, void *data);
+extern void setErrorCallback(ErrorCallback cbk);
 
 extern void CDECL error(ErrorCategory category, Goffset pos, const char *msg, ...) GOOSTRING_FORMAT;
 
diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index 3c82bd48..ae0a1b6f 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -1258,14 +1258,14 @@ void GlobalParams::setErrQuiet(bool errQuietA) {
   errQuiet = errQuietA;
 }
 
-GlobalParamsIniter::GlobalParamsIniter(ErrorCallback errorCallback, void *errorCallbackData)
+GlobalParamsIniter::GlobalParamsIniter(ErrorCallback errorCallback)
 {
   std::lock_guard<std::mutex> lock{mutex};
 
   if (count == 0) {
     globalParams = std::make_unique<GlobalParams>(!customDataDir.empty() ? customDataDir.c_str() : nullptr);
 
-    setErrorCallback(errorCallback, errorCallbackData);
+    setErrorCallback(errorCallback);
   }
 
   count++;
diff --git a/poppler/GlobalParams.h b/poppler/GlobalParams.h
index 5ac536e2..eac31ade 100644
--- a/poppler/GlobalParams.h
+++ b/poppler/GlobalParams.h
@@ -223,7 +223,7 @@ private:
 class GlobalParamsIniter
 {
 public:
-  GlobalParamsIniter(ErrorCallback errorCallback, void *errorCallbackData);
+  GlobalParamsIniter(ErrorCallback errorCallback);
   ~GlobalParamsIniter();
 
   GlobalParamsIniter(const GlobalParamsIniter &) = delete;
diff --git a/qt5/src/poppler-private.cc b/qt5/src/poppler-private.cc
index b1346ad1..35ebbda6 100644
--- a/qt5/src/poppler-private.cc
+++ b/qt5/src/poppler-private.cc
@@ -60,7 +60,7 @@ namespace Debug {
         Debug::debugClosure = closure;
     }
 
-    void qt5ErrorFunction(void * /*data*/, ErrorCategory /*category*/, Goffset pos, const char *msg)
+    void qt5ErrorFunction(ErrorCategory /*category*/, Goffset pos, const char *msg)
     {
         QString emsg;
 
diff --git a/qt5/src/poppler-private.h b/qt5/src/poppler-private.h
index 3fc7f7ec..63158461 100644
--- a/qt5/src/poppler-private.h
+++ b/qt5/src/poppler-private.h
@@ -75,7 +75,7 @@ namespace Poppler {
 
     GooString *QDateTimeToUnicodeGooString(const QDateTime &dt);
 
-    void qt5ErrorFunction(void * /*data*/, ErrorCategory /*category*/, Goffset pos, const char *msg);
+    void qt5ErrorFunction(ErrorCategory /*category*/, Goffset pos, const char *msg);
 
     Annot::AdditionalActionsType toPopplerAdditionalActionType(Annotation::AdditionalActionType type);
 
@@ -96,7 +96,7 @@ namespace Poppler {
     class DocumentData : private GlobalParamsIniter {
     public:
 	DocumentData(const QString &filePath, GooString *ownerPassword, GooString *userPassword) :
-	GlobalParamsIniter(qt5ErrorFunction, nullptr)
+	GlobalParamsIniter(qt5ErrorFunction)
 	    {
 		init();
 		m_filePath = filePath;	
@@ -113,7 +113,7 @@ namespace Poppler {
 	    }
 	
 	DocumentData(const QByteArray &data, GooString *ownerPassword, GooString *userPassword) :
-	GlobalParamsIniter(qt5ErrorFunction, nullptr)
+	GlobalParamsIniter(qt5ErrorFunction)
 	    {
 		fileContents = data;
 		MemStream *str = new MemStream((char*)fileContents.data(), 0, fileContents.length(), Object(objNull));
diff --git a/test/perf-test.cc b/test/perf-test.cc
index 70220cd3..03f78788 100644
--- a/test/perf-test.cc
+++ b/test/perf-test.cc
@@ -739,7 +739,7 @@ static void StrList_Destroy(StrList **root)
     *root = nullptr;
 }
 
-static void my_error(void *, ErrorCategory, Goffset pos, const char *msg) {
+static void my_error(ErrorCategory, Goffset pos, const char *msg) {
 #if 0
     char        buf[4096], *p = buf;
 
@@ -1230,7 +1230,7 @@ static void RenderCmdLineArg(char *cmdLineArg)
 
 int main(int argc, char **argv)
 {
-    setErrorCallback(my_error, nullptr);
+    setErrorCallback(my_error);
     ParseCommandLine(argc, argv);
     if (0 == StrList_Len(&gArgsListRoot))
         PrintUsageAndExit(argc, argv);