Changeset 252 for trunk/src/sh_portcheck.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_portcheck.c (modified) (9 diffs)

trunk/src/sh_portcheck.c

@@ -312 +312 @@
                       SH_FREE(splits);
                       sh_string_destroy(&s);
-                      fclose(fp);
+                      sl_fclose(FIL__, __LINE__, fp);
                       return buf;
                     }
@@ -320 +320 @@
         }
       sh_string_destroy(&s);
-      fclose(fp);
+      sl_fclose(FIL__, __LINE__, fp);
     }
   return NULL;
@@ -360 +360 @@
                           SH_FREE(splits);
                           sh_string_destroy(&s);
-                          fclose(fp);
+                          sl_fclose(FIL__, __LINE__, fp);
                           return buf;
                         }
@@ -369 +369 @@
         }
       sh_string_destroy(&s);
-      fclose(fp);
+      sl_fclose(FIL__, __LINE__, fp);
     }
   return NULL;
@@ -874 +874 @@
         }
     }
-  close (fd);
+  sl_close_fd (FIL__, __LINE__, fd);
   return 0;
 }
@@ -988 +988 @@
                 port);
      }
-  close (fd);
+  sl_close_fd (FIL__, __LINE__, fd);
   return 0;
 }
@@ -1226 +1226 @@
   for (port = min_port; port <= max_port; ++port) 
     {
-
       if ((sock = socket(AF_INET, type, protocol)) < 0 )
         {
@@ -1265 +1264 @@
           /* we can bind the port, thus it is unused
            */
-          close (sock);
+          sl_close_fd (FIL__, __LINE__, sock);
         }
       else
@@ -1290 +1289 @@
 #endif
             }
-          close (sock);
+          sl_close_fd (FIL__, __LINE__, sock);
         }
     }