[apparmor] [PATCH] Export the log parsing interface with the aa_ prefix

[John Johansen]

export the log parsing interface so that it uses the aa_ prefix, while
retaining the old interface for backwards compatability.

Signed-off-by: John Johansen <john.johansen at canonical.com>
---
 libraries/libapparmor/src/aalogparse.h       |    4 ++--
 libraries/libapparmor/src/libaalogparse.c    |    4 ++--
 libraries/libapparmor/src/libapparmor.map    |    2 ++
 libraries/libapparmor/testsuite/test_multi.c |    4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libraries/libapparmor/src/aalogparse.h b/libraries/libapparmor/src/aalogparse.h
index c439bfb..3e913e4 100644
--- a/libraries/libapparmor/src/aalogparse.h
+++ b/libraries/libapparmor/src/aalogparse.h
@@ -151,14 +151,14 @@ typedef struct
  * @return Parsed data.
  */
 aa_log_record *
-parse_record(char *str);
+aa_parse_record(char *str);
 
 /**
  * Frees all struct data.
  * @param[in] Data to free.
  */
 void
-free_record(aa_log_record *record);
+aa_free_record(aa_log_record *record);
 
 #endif
 
diff --git a/libraries/libapparmor/src/libaalogparse.c b/libraries/libapparmor/src/libaalogparse.c
index 5292830..2d08775 100644
--- a/libraries/libapparmor/src/libaalogparse.c
+++ b/libraries/libapparmor/src/libaalogparse.c
@@ -35,7 +35,7 @@
 #include "parser.h"
 
 /* This is mostly just a wrapper around the code in grammar.y */
-aa_log_record *parse_record(char *str)
+aa_log_record *aa_parse_record(char *str)
 {
 	if (str == NULL)
 		return NULL;
@@ -43,7 +43,7 @@ aa_log_record *parse_record(char *str)
 	return _parse_yacc(str);
 }
 
-void free_record(aa_log_record *record)
+void aa_free_record(aa_log_record *record)
 {
 	if (record != NULL)
 	{
diff --git a/libraries/libapparmor/src/libapparmor.map b/libraries/libapparmor/src/libapparmor.map
index ebd13c9..362eaf3 100644
--- a/libraries/libapparmor/src/libapparmor.map
+++ b/libraries/libapparmor/src/libapparmor.map
@@ -25,6 +25,8 @@ APPARMOR_1.1 {
         aa_introspect_confinement;
         parse_record;
         free_record;
+        aa_parse_record;
+        aa_free_record;
   local:
 	*;
 } APPARMOR_1.0;
diff --git a/libraries/libapparmor/testsuite/test_multi.c b/libraries/libapparmor/testsuite/test_multi.c
index 93e2d63..e1c3ec8 100644
--- a/libraries/libapparmor/testsuite/test_multi.c
+++ b/libraries/libapparmor/testsuite/test_multi.c
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
 
 	fclose(testcase);
 
-	test = parse_record(log_line);
+	test = aa_parse_record(log_line);
 
 	if (test == NULL)
 	{
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
 		return(1);
 	}
 	ret = print_results(test);
-	free_record(test);
+	aa_free_record(test);
 	return ret;
 }
 
-- 
1.7.5.4