Removed unnecessary xfree, and all references to it

diff --git a/src/include/radiusd.h b/src/include/radiusd.h
index 265b147..9865730 100644 (file)
--- a/src/include/radiusd.h
+++ b/src/include/radiusd.h
@@ -308,7 +308,6 @@ void                request_free(REQUEST **request);
 int            rad_mkdir(char *directory, int mode);
 int            rad_checkfilename(const char *filename);
 void           *rad_malloc(size_t size); /* calls exit(1) on error! */
-void           xfree(const char *ptr);
 REQUEST                *request_alloc(void);
 REQUEST                *request_alloc_fake(REQUEST *oldreq);
 int            request_data_add(REQUEST *request,

diff --git a/src/main/radiusd.c b/src/main/radiusd.c
index 3d26880..0b8a55e 100644 (file)
--- a/src/main/radiusd.c
+++ b/src/main/radiusd.c
@@ -717,7 +717,7 @@ int main(int argc, char *argv[])
                                break;
 
                        case 'a':
-                               if (radacct_dir) xfree(radacct_dir);
+                               if (radacct_dir) free(radacct_dir);
                                radacct_dir = strdup(optarg);
                                break;
 
@@ -726,7 +726,7 @@ int main(int argc, char *argv[])
                                break;
 
                        case 'd':
-                               if (radius_dir) xfree(radius_dir);
+                               if (radius_dir) free(radius_dir);
                                radius_dir = strdup(optarg);
                                break;
 
@@ -1872,6 +1872,7 @@ static void sig_fatal(int sig)
 static void sig_hup(int sig)
 {
        sig = sig; /* -Wunused */
+
        reset_signal(SIGHUP, sig_hup);
 
        /*

diff --git a/src/main/util.c b/src/main/util.c
index 1e29127..694ea6a 100644 (file)
--- a/src/main/util.c
+++ b/src/main/util.c
@@ -315,11 +315,6 @@ void *rad_malloc(size_t size)
        return ptr;
 }
 
-void xfree(const char *ptr)
-{
-       free((char *)ptr);
-}
-
 /*
  *     Logs an error message and aborts the program
  *

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c
index 3c7d815..55701ed 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c
@@ -89,10 +89,10 @@ free_result_row(rlm_sql_postgres_sock * pg_sock)
        if (pg_sock->row != NULL) {
                for (i = pg_sock->num_fields-1; i >= 0; i--) {
                        if (pg_sock->row[i] != NULL) {
-                               xfree(pg_sock->row[i]);
+                               free(pg_sock->row[i]);
                        }
                }
-               xfree((char*)pg_sock->row);
+               free((char*)pg_sock->row);
                pg_sock->row = NULL;
                pg_sock->num_fields = 0;
        }