Refactored FD close calls into a single new dClose() dlib function [p37sitdu]

2 files changed, 8 insertions, 8 deletions

diff --git a/dpi/downloads.cc b/dpi/downloads.cc
index 6f36afe9..70acaa8a 100644
--- a/dpi/downloads.cc
+++ b/dpi/downloads.cc
@@ -441,7 +441,7 @@ DLItem::~DLItem()
 void DLItem::abort_dl()
 {
    if (!log_done()) {
-      close(LogPipe[0]);
+      dClose(LogPipe[0]);
       Fl::remove_fd(LogPipe[0]);
       log_done(1);
       // Stop wget
@@ -459,9 +459,9 @@ void DLItem::prButton_cb()
 
 void DLItem::child_init()
 {
-   close(0); // stdin
-   close(1); // stdout
-   close(LogPipe[0]);
+   dClose(0); // stdin
+   dClose(1); // stdout
+   dClose(LogPipe[0]);
    dup2(LogPipe[1], 2); // stderr
    // set the locale to C for log parsing
    setenv("LC_ALL", "C", 1);
@@ -618,7 +618,7 @@ static void read_log_cb(int fd_in, void *data)
          perror("read, ");
          break;
       } else if (st == 0) {
-         close(fd_in);
+         dClose(fd_in);
          Fl::remove_fd(fd_in, 1);
          dl_item->log_done(1);
          break;
@@ -630,7 +630,7 @@ static void read_log_cb(int fd_in, void *data)
 
 void DLItem::father_init()
 {
-   close(LogPipe[1]);
+   dClose(LogPipe[1]);
    Fl::add_fd(LogPipe[0], 1, read_log_cb, this); // Read
 
    // Start the timer after the child is running.
diff --git a/dpi/https.c b/dpi/https.c
index 389c608d..9aea31e5 100644
--- a/dpi/https.c
+++ b/dpi/https.c
@@ -330,7 +330,7 @@ static void yes_ssl_support(void)
    dFree(check_cert);
 
    if (network_socket != -1){
-      close(network_socket);
+      dClose(network_socket);
       network_socket = -1;
    }
    if (ssl_connection != NULL){
@@ -402,7 +402,7 @@ static int get_network_connection(char * url)
 
    s = socket(hp->h_addrtype, SOCK_STREAM, 0);
    if (connect(s, (struct sockaddr *)&address, sizeof(address)) != 0){
-      close(s);
+      dClose(s);
       s = -1;
       MSG("errno: %i\n", errno);
    }