Rename unlang.c and modcall.c to unlang_interpret.c and unlang_compile.c

diff --git a/src/main/radiusd.mk b/src/main/radiusd.mk
index a8ff66e2db610f435c95b3a32e94e41473bbb042..694482c271a464d959669e392fe6e7731c0a878b 100644 (file)
--- a/src/main/radiusd.mk
+++ b/src/main/radiusd.mk
@@ -8,7 +8,6 @@ SOURCES := acct.c \
     listen.c \
     mainconfig.c \
     modules.c \
-    modcall.c \
     radiusd.c \
     realms.c \
     state.c \
@@ -17,7 +16,8 @@ SOURCES := acct.c \
     session.c \
     snmp.c \
     threads.c \
-    unlang.c \
+    unlang_compile.c \
+    unlang_interpret.c \
     virtual_servers.c \
     process.c
 

diff --git a/src/main/unit_test_map.mk b/src/main/unit_test_map.mk
index f8f29851eb7ffcac21e9342351b3b6b140e967e0..68ec21ffe3e4882649856a2cb493a71ab3493c4d 100644 (file)
--- a/src/main/unit_test_map.mk
+++ b/src/main/unit_test_map.mk
@@ -1,5 +1,5 @@
 TARGET         := unit_test_map
-SOURCES                := unit_test_map.c ${top_srcdir}/src/main/modcall.c ${top_srcdir}/src/main/unlang.c
+SOURCES                := unit_test_map.c ${top_srcdir}/src/main/unlang_compile.c ${top_srcdir}/src/main/unlang_interpret.c
 
 TGT_PREREQS    := libfreeradius-server.a libfreeradius-radius.a
 TGT_LDLIBS     := $(LIBS)

diff --git a/src/main/unit_test_module.mk b/src/main/unit_test_module.mk
index 1054930dc4b67a0891fa0b700c33b9834e7b96eb..dbbf9532d81d6f77c76c9d92f2ff71244a4fe198 100644 (file)
--- a/src/main/unit_test_module.mk
+++ b/src/main/unit_test_module.mk
@@ -7,14 +7,14 @@ SOURCES := \
        files.c \
        mainconfig.c \
        modules.c \
-       modcall.c \
        unit_test_module.c \
        soh.c \
        state.c \
        session.c \
        version.c  \
        virtual_servers.c \
-       unlang.c \
+       unlang_compile.c \
+       unlang_interpret.c \
        realms.c
 
 ifneq ($(OPENSSL_LIBS),)

diff --git a/src/main/modcall.c b/src/main/unlang_compile.c
similarity index 99%
rename from src/main/modcall.c
rename to src/main/unlang_compile.c
index 396d7a98311bb3c620e68ab61a49ce82955be0d7..0f7644e35978ff1c86a17e408f8dd0dc3f5a5109 100644 (file)
--- a/src/main/modcall.c
+++ b/src/main/unlang_compile.c
@@ -1,8 +1,4 @@
 /*
- * @name modcall.c
- *
- * Version:    $Id$
- *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -16,10 +12,16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- *
- * Copyright 2000,2006  The FreeRADIUS server project
  */
 
+/**
+ * $Id$
+ *
+ * @file unlang_compile.c
+ * @brief Functions to convert configuration sections into unlang structures.
+ *
+ * @copyright 2006-2016 The FreeRADIUS server project
+ */
 RCSID("$Id$")
 
 #include <freeradius-devel/radiusd.h>
@@ -27,7 +29,6 @@ RCSID("$Id$")
 #include <freeradius-devel/interpreter.h>
 #include <freeradius-devel/parser.h>
 
-
 /* Here's where we recognize all of our keywords: first the rcodes, then the
  * actions */
 const FR_NAME_NUMBER mod_rcode_table[] = {

diff --git a/src/main/unlang.c b/src/main/unlang_interpret.c
similarity index 99%
rename from src/main/unlang.c
rename to src/main/unlang_interpret.c
index 550261b7d833dbc63aefb973d10dcd8b788802a9..7d46486db40ddcf79c229f16034c2af4b1f30a4c 100644 (file)
--- a/src/main/unlang.c
+++ b/src/main/unlang_interpret.c
@@ -1,8 +1,4 @@
 /*
- * @name unlang.c
- *
- * Version:    $Id$
- *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -16,10 +12,16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- *
- * Copyright 2000,2006  The FreeRADIUS server project
  */
 
+/**
+ * $Id$
+ *
+ * @file unlang_interpret.c
+ * @brief Execute compiled unlang structures using an iterative interpreter.
+ *
+ * @copyright 2006-2016 The FreeRADIUS server project
+ */
 RCSID("$Id$")
 
 #include <freeradius-devel/radiusd.h>