libdpkg: Improve error handler and printer function argument names

lib/dpkg/ehandle.c

@@ -129,10 +129,10 @@ error_context_new(void)
 }
 
 static void
-set_error_printer(struct error_context *ec, error_printer_func *printerror,
+set_error_printer(struct error_context *ec, error_printer_func *func,
                   const char *contextstring)
 {
-  ec->printer.func = printerror;
+  ec->printer.func = func;
   ec->printer.data = contextstring;
 }
 
@@ -151,28 +151,28 @@ set_jump_handler(struct error_context *ec, jmp_buf *jump)
 }
 
 void
-push_error_context_func(error_handler_func *func,
-                        error_printer_func *printerror,
+push_error_context_func(error_handler_func *handler,
+                        error_printer_func *printer,
                         const char *contextstring)
 {
   struct error_context *ec;
 
   ec = error_context_new();
-  set_error_printer(ec, printerror, contextstring);
-  set_func_handler(ec, func);
+  set_error_printer(ec, printer, contextstring);
+  set_func_handler(ec, handler);
   onerr_abort = 0;
 }
 
 void
-push_error_context_jump(jmp_buf *jump,
-                        error_printer_func *printerror,
+push_error_context_jump(jmp_buf *jumper,
+                        error_printer_func *printer,
                         const char *contextstring)
 {
   struct error_context *ec;
 
   ec = error_context_new();
-  set_error_printer(ec, printerror, contextstring);
-  set_jump_handler(ec, jump);
+  set_error_printer(ec, printer, contextstring);
+  set_jump_handler(ec, jumper);
   onerr_abort = 0;
 }
 

lib/dpkg/ehandle.h

@@ -50,11 +50,11 @@ typedef void error_printer_func(const char *emsg, const char *contextstring);
 void print_fatal_error(const char *emsg, const char *contextstring);
 void catch_fatal_error(void);
 
-void push_error_context_jump(jmp_buf *jbufp,
-                             error_printer_func *printerror,
+void push_error_context_jump(jmp_buf *jumper,
+                             error_printer_func *printer,
                              const char *contextstring);
-void push_error_context_func(error_handler_func *func,
-                             error_printer_func *printerror,
+void push_error_context_func(error_handler_func *handler,
+                             error_printer_func *printer,
                              const char *contextstring);
 void push_error_context(void);
 void pop_error_context(int flagset);