sieve: simplify action logging API

* include/mailutils/sieve.h (mu_sieve_action_log_t): Change proto.
* lib/sieve.c (_sieve_action_log): Rewrite.
* libmu_sieve/util.c (mu_sieve_log_action): Rewrite.
* python/libmu_py/sieve.c (_sieve_action_printer): Rewrite.
* sieve/sieve.c (_sieve_action_log): Rewrite.

@@ -35,9 +35,7 @@ typedef struct mu_sieve_machine *mu_sieve_machine_t;
 
 
 typedef int (*mu_sieve_handler_t) (mu_sieve_machine_t mach,
 typedef int (*mu_sieve_handler_t) (mu_sieve_machine_t mach,
 				   mu_list_t args, mu_list_t tags);
 				   mu_list_t args, mu_list_t tags);
-typedef void (*mu_sieve_action_log_t) (void *data,
-				       mu_stream_t stream,
-				       size_t msgno, mu_message_t msg,
+typedef void (*mu_sieve_action_log_t) (mu_sieve_machine_t mach,
 				       const char *action,
 				       const char *action,
 				       const char *fmt, va_list ap);
 				       const char *fmt, va_list ap);
 
 

@@ -28,15 +28,17 @@ struct sieve_log_data
 };
 };
 
 
 static void
 static void
-_sieve_action_log (void *data,
-		   mu_stream_t stream, size_t msgno,
-		   mu_message_t msg,
+_sieve_action_log (mu_sieve_machine_t mach,
 		   const char *action, const char *fmt, va_list ap)
 		   const char *action, const char *fmt, va_list ap)
 {
 {
-  struct sieve_log_data *ldat = data;
+  struct sieve_log_data *ldat = mu_sieve_get_data (mach);
   int pfx = 0;
   int pfx = 0;
+  mu_stream_t stream;
+  mu_message_t msg = mu_sieve_get_message (mach);
 
 
+  mu_sieve_get_diag_stream (mach, &stream);
   mu_stream_printf (stream, "\033s<%d>", MU_LOG_NOTICE);
   mu_stream_printf (stream, "\033s<%d>", MU_LOG_NOTICE);
+
   if (ldat)
   if (ldat)
     {
     {
       if (ldat->user)
       if (ldat->user)
@@ -70,6 +72,7 @@ _sieve_action_log (void *data,
       mu_stream_vprintf (stream, fmt, ap);
       mu_stream_vprintf (stream, fmt, ap);
     }
     }
   mu_stream_printf (stream, "\n");
   mu_stream_printf (stream, "\n");
+  mu_stream_unref (stream);
 }
 }
 
 
 static int
 static int

@@ -344,16 +344,11 @@ mu_sieve_log_action (mu_sieve_machine_t mach, const char *action,
   
   
   if (!mach->logger)
   if (!mach->logger)
     return;
     return;
+  
+  mu_stream_ioctl (mach->errstream, MU_IOCTL_LOGSTREAM,
+		   MU_IOCTL_LOGSTREAM_SET_LOCUS, &mach->locus);
   va_start (ap, fmt);
   va_start (ap, fmt);
-  mu_stream_printf (mach->errstream, "\033s<%d>", MU_LOG_INFO);
-  if (mach->locus.mu_file)
-    mu_stream_printf (mach->errstream, "\033O<%d>\033f<%u>%s\033l<%u>",
-		      MU_LOGMODE_LOCUS,
-		      (unsigned) strlen (mach->locus.mu_file),
-		      mach->locus.mu_file,
-		      mach->locus.mu_line);
-  mach->logger (mach->data, mach->errstream, mach->msgno, mach->msg,
-		action, fmt, ap);
+  mach->logger (mach, action, fmt, ap);
   va_end (ap);
   va_end (ap);
 }
 }
   
   

@@ -236,8 +236,7 @@ api_sieve_message (PyObject *self, PyObject *args)
 }
 }
 
 
 static void
 static void
-_sieve_action_printer (void *data, mu_stream_t stream,
-		       size_t msgno, mu_message_t msg,
+_sieve_action_printer (mu_sieve_machine_t mach,
 		       const char *action, const char *fmt, va_list ap)
 		       const char *action, const char *fmt, va_list ap)
 {
 {
   PyObject *py_args;
   PyObject *py_args;
@@ -258,10 +257,12 @@ _sieve_action_printer (void *data, mu_stream_t stream,
 	  PyStream *py_stm = PyStream_NEW ();
 	  PyStream *py_stm = PyStream_NEW ();
 	  if (py_stm)
 	  if (py_stm)
 	    {
 	    {
-	      py_stm->stm = stream;
-	      mu_stream_ref (stream);
-	  
-	      py_msg->msg = msg;
+	      size_t msgno;
+	      
+	      mu_sieve_get_diag_stream (mach, &py_stm->stm);
+	      msgno = mu_sieve_get_message_num (mach);
+	      
+	      py_msg->msg = mu_sieve_get_message (mach);
 	      Py_INCREF (py_msg);
 	      Py_INCREF (py_msg);
 
 
 	      PyDict_SetItemString (py_dict, "msgno",
 	      PyDict_SetItemString (py_dict, "msgno",
@@ -272,7 +273,7 @@ _sieve_action_printer (void *data, mu_stream_t stream,
 
 
 	      if (mu_vasnprintf (&buf, &buflen, fmt, ap))
 	      if (mu_vasnprintf (&buf, &buflen, fmt, ap))
 		{
 		{
-		  mu_stream_unref (stream);
+		  mu_stream_destroy (&py_stm->stm);
 		  return;
 		  return;
 		}
 		}
 	      PyDict_SetItemString (py_dict, "text",
 	      PyDict_SetItemString (py_dict, "text",
@@ -282,7 +283,7 @@ _sieve_action_printer (void *data, mu_stream_t stream,
 	      py_args = PyTuple_New (1);
 	      py_args = PyTuple_New (1);
 	      if (py_args)
 	      if (py_args)
 		{
 		{
-		  struct _mu_py_sieve_logger *s = data;
+		  struct _mu_py_sieve_logger *s = mu_sieve_get_data (mach);
 		  PyObject *py_fnc = s->py_action_printer;
 		  PyObject *py_fnc = s->py_action_printer;
 
 
 		  Py_INCREF (py_dict);
 		  Py_INCREF (py_dict);

@@ -264,18 +264,21 @@ Compatibility debug flags:\n\
 };
 };
 
 
 static void
 static void
-_sieve_action_log (void *unused,
-		   mu_stream_t stream, size_t msgno,
-		   mu_message_t msg,
+_sieve_action_log (mu_sieve_machine_t mach,
 		   const char *action, const char *fmt, va_list ap)
 		   const char *action, const char *fmt, va_list ap)
 {
 {
   size_t uid = 0;
   size_t uid = 0;
+  mu_message_t msg;
+  mu_stream_t stream;
+
+  mu_sieve_get_diag_stream (mach, &stream);
+  msg = mu_sieve_get_message (mach);
   
   
   mu_message_get_uid (msg, &uid);
   mu_message_get_uid (msg, &uid);
   mu_stream_printf (stream, "\033s<%d>\033%c<%d>", MU_LOG_NOTICE,
   mu_stream_printf (stream, "\033s<%d>\033%c<%d>", MU_LOG_NOTICE,
 		    sieve_print_locus ? 'O' : 'X', MU_LOGMODE_LOCUS);
 		    sieve_print_locus ? 'O' : 'X', MU_LOGMODE_LOCUS);
   mu_stream_printf (stream, _("%s on msg uid %lu"),
   mu_stream_printf (stream, _("%s on msg uid %lu"),
-		  action, (unsigned long) uid);
+		    action, (unsigned long) uid);
   
   
   if (fmt && strlen (fmt))
   if (fmt && strlen (fmt))
     {
     {
@@ -283,6 +286,8 @@ _sieve_action_log (void *unused,
       mu_stream_vprintf (stream, fmt, ap);
       mu_stream_vprintf (stream, fmt, ap);
     }
     }
   mu_stream_printf (stream, "\n");
   mu_stream_printf (stream, "\n");
+
+  mu_stream_unref (stream);
 }
 }
 
 
 static int
 static int