[Selinux-commits] SF.net SVN: selinux: [2236] trunk/libsemanage/src

[<ssm...@us...>]

Revision: 2236
          http://svn.sourceforge.net/selinux/?rev=2236&view=rev
Author:   ssmalley
Date:     2007-02-20 05:36:14 -0800 (Tue, 20 Feb 2007)

Log Message:
-----------
Author: Caleb Case
Email: cc...@tr...
Subject: libsemanage: function name consistency change for semanage_get_commit_number
Date: Tue, 6 Feb 2007 11:26:32 -0500

All functions used in the callback structs have the same ending as the functions they call.  semanage_get_commit_number was the one exception and has been changed to semanage_direct_get_serial.

Modified Paths:
--------------
    trunk/libsemanage/src/direct_api.c
    trunk/libsemanage/src/semanage_store.c
    trunk/libsemanage/src/semanage_store.h

Modified: trunk/libsemanage/src/direct_api.c
===================================================================
--- trunk/libsemanage/src/direct_api.c	2007-02-20 13:34:09 UTC (rev 2235)
+++ trunk/libsemanage/src/direct_api.c	2007-02-20 13:36:14 UTC (rev 2236)
@@ -65,7 +65,7 @@
 				int *num_modules);
 
 static struct semanage_policy_table direct_funcs = {
-	.get_serial = semanage_get_commit_number,
+	.get_serial = semanage_direct_get_serial,
 	.destroy = semanage_direct_destroy,
 	.disconnect = semanage_direct_disconnect,
 	.begin_trans = semanage_direct_begintrans,
@@ -911,7 +911,7 @@
 		goto cleanup;
 	}
 	if (num_mod_files == 0) {
-		retval = semanage_get_commit_number(sh);
+		retval = semanage_direct_get_serial(sh);
 		goto cleanup;
 	}
 
@@ -954,7 +954,7 @@
 			free(version);
 		}
 	}
-	retval = semanage_get_commit_number(sh);
+	retval = semanage_direct_get_serial(sh);
 
       cleanup:
 	sepol_policy_file_free(pf);

Modified: trunk/libsemanage/src/semanage_store.c
===================================================================
--- trunk/libsemanage/src/semanage_store.c	2007-02-20 13:34:09 UTC (rev 2235)
+++ trunk/libsemanage/src/semanage_store.c	2007-02-20 13:36:14 UTC (rev 2236)
@@ -1151,7 +1151,7 @@
 	struct stat buf;
 
 	/* update the commit number */
-	if ((commit_number = semanage_get_commit_number(sh)) < 0) {
+	if ((commit_number = semanage_direct_get_serial(sh)) < 0) {
 		return -1;
 	}
 	commit_number++;
@@ -1412,7 +1412,7 @@
 /* Read the current commit number from the commit number file which
  * the handle is pointing, resetting the file pointer afterwards.
  * Return it (a non-negative number), or -1 on error. */
-int semanage_get_commit_number(semanage_handle_t * sh)
+int semanage_direct_get_serial(semanage_handle_t * sh)
 {
 	char buf[32];
 	int fd, commit_number;

Modified: trunk/libsemanage/src/semanage_store.h
===================================================================
--- trunk/libsemanage/src/semanage_store.h	2007-02-20 13:34:09 UTC (rev 2235)
+++ trunk/libsemanage/src/semanage_store.h	2007-02-20 13:36:14 UTC (rev 2236)
@@ -89,7 +89,7 @@
 int semanage_get_active_lock(semanage_handle_t * sh);
 void semanage_release_trans_lock(semanage_handle_t * sh);
 void semanage_release_active_lock(semanage_handle_t * sh);
-int semanage_get_commit_number(semanage_handle_t * sh);
+int semanage_direct_get_serial(semanage_handle_t * sh);
 
 int semanage_link_sandbox(semanage_handle_t * sh,
 			  sepol_module_package_t ** base);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.