Fix improperly placed variable declarations.

* imap4d/id.c
* libproto/imap/folder.c
* libproto/pop/mbox.c
* sieve/sieve.c

@@ -173,10 +173,10 @@ imap4d_id (struct imap4d_command *command, imap4d_tokbuf_t tok)
   if (imap4d_id_list)
   if (imap4d_id_list)
     {
     {
       mu_iterator_t itr;
       mu_iterator_t itr;
-      mu_list_get_iterator (imap4d_id_list, &itr);
       int i;
       int i;
       int outcnt = 0;
       int outcnt = 0;
       
       
+      mu_list_get_iterator (imap4d_id_list, &itr);
       for (i = 0, mu_iterator_first (itr);
       for (i = 0, mu_iterator_first (itr);
 	   i < 30 && !mu_iterator_is_done (itr);
 	   i < 30 && !mu_iterator_is_done (itr);
 	   i++, mu_iterator_next (itr))
 	   i++, mu_iterator_next (itr))

@@ -574,10 +574,12 @@ static int
 imap_writer (void *iodata, char *buf)
 imap_writer (void *iodata, char *buf)
 {
 {
   f_imap_t iop = iodata;
   f_imap_t iop = iodata;
+  int status;
+    
   MU_DEBUG2 (iop->folder->debug, MU_DEBUG_PROT, "g%lu %s\n",
   MU_DEBUG2 (iop->folder->debug, MU_DEBUG_PROT, "g%lu %s\n",
              (unsigned long)iop->seq, buf);
              (unsigned long)iop->seq, buf);
-  int status = imap_writeline (iop, "g%lu %s\r\n",
-                               (unsigned long)iop->seq++, buf);
+  status = imap_writeline (iop, "g%lu %s\r\n",
+			   (unsigned long)iop->seq++, buf);
   CHECK_ERROR (iop, status);
   CHECK_ERROR (iop, status);
   status = imap_send (iop);
   status = imap_send (iop);
   CHECK_ERROR (iop, status);
   CHECK_ERROR (iop, status);

@@ -729,8 +729,10 @@ static int
 pop_writer (void *iodata, char *buf)
 pop_writer (void *iodata, char *buf)
 {
 {
   pop_data_t iop = iodata;
   pop_data_t iop = iodata;
+  int status;
+  
   MU_DEBUG1 (iop->mbox->debug, MU_DEBUG_PROT, "%s\n", buf);
   MU_DEBUG1 (iop->mbox->debug, MU_DEBUG_PROT, "%s\n", buf);
-  int status = pop_writeline (iop, "%s\r\n", buf);
+  status = pop_writeline (iop, "%s\r\n", buf);
   CHECK_ERROR (iop, status);
   CHECK_ERROR (iop, status);
   status = pop_write (iop);
   status = pop_write (iop);
   CHECK_ERROR (iop, status);
   CHECK_ERROR (iop, status);

@@ -271,9 +271,11 @@ cb_debug (mu_debug_t debug, void *data, mu_config_value_t *val)
 static int
 static int
 cb_email (mu_debug_t debug, void *data, mu_config_value_t *val)
 cb_email (mu_debug_t debug, void *data, mu_config_value_t *val)
 {
 {
+  int rc;
+  
   if (mu_cfg_assert_value_type (val, MU_CFG_STRING, debug))
   if (mu_cfg_assert_value_type (val, MU_CFG_STRING, debug))
     return 1;
     return 1;
-  int rc = mu_set_user_email (val->v.string);
+  rc = mu_set_user_email (val->v.string);
   if (rc)
   if (rc)
     mu_cfg_format_error (debug, MU_DEBUG_ERROR, _("invalid email: %s"),
     mu_cfg_format_error (debug, MU_DEBUG_ERROR, _("invalid email: %s"),
 			 mu_strerror (rc));
 			 mu_strerror (rc));