Changeset 252 for trunk/src/sh_mail.c

Timestamp:

Oct 12, 2009, 10:40:45 AM (15 years ago)

Author:

katerina

Message:

Add code to check for stale file records on close() and fclose(), fix sl_close() to handle open stream (ticket #163).

File:

• trunk/src/sh_mail.c (modified) (9 diffs)

trunk/src/sh_mail.c

@@ -734 +734 @@
                 if (connfile != NULL)
                   {
-                    (void) fclose (connfile);
+                    (void) sl_fclose (FIL__, __LINE__, connfile);
                     connfile = NULL;
                   }
@@ -795 +795 @@
         if (connfile != NULL)
           {
-            (void) fclose (connfile);
+            (void) sl_fclose (FIL__, __LINE__, connfile);
             connfile = NULL;
           }
@@ -1091 +1091 @@
     {
       TPT(( 0, FIL__, __LINE__, _("msg=<fdopen() failed>\n")));
-      (void) close(fd);
+      (void) sl_close_fd(FIL__, __LINE__, fd);
       SL_RETURN( NULL, _("sh_mail_start_conn"));
     }
@@ -1105 +1105 @@
                       _("mail"), sh.host.name);
       TPT(( 0, FIL__, __LINE__, _("msg=<Timeout>\n")));
-      (void) fclose(connFile);
+      (void) sl_fclose(FIL__, __LINE__, connFile);
       SL_RETURN( NULL, _("sh_mail_start_conn"));
     }
@@ -1135 +1135 @@
 
       TPT(( 0, FIL__, __LINE__, _("msg=<Timeout.>\n")));
-      (void) fclose(connFile);
+      (void) sl_fclose(FIL__, __LINE__, connFile);
       SL_RETURN( NULL, _("sh_mail_start_conn"));
     }
@@ -1167 +1167 @@
                       _("mail"), this_address);
       TPT(( 0, FIL__, __LINE__, _("msg=<Timeout.>\n")));
-      (void) fclose(connFile);
+      (void) sl_fclose(FIL__, __LINE__, connFile);
       SL_RETURN( NULL, _("sh_mail_start_conn"));
     }
@@ -1188 +1188 @@
                           _("mail"), address);
           TPT(( 0, FIL__, __LINE__, _("msg=<Timeout.>\n")));
-          (void) fclose(connFile);
+          (void) sl_fclose(FIL__, __LINE__, connFile);
           SL_RETURN( NULL, _("sh_mail_start_conn"));
         }
@@ -1234 +1234 @@
       if (ecount == address_num)
         {
-          (void) fclose(connFile);
+          (void) sl_fclose(FIL__, __LINE__, connFile);
           SL_RETURN( NULL, _("sh_mail_start_conn"));
         }
@@ -1253 +1253 @@
                       _("mail"), address);
       TPT(( 0, FIL__, __LINE__, _("msg=<Timeout.>\n")));
-      (void) fclose(connFile);
+      (void) sl_fclose(FIL__, __LINE__, connFile);
       SL_RETURN( NULL, _("sh_mail_start_conn"));
     }