[sr-dev] git:master: modules/usrloc: renamed ul.users and ul.contacts rpc commands

[Juha Heinanen]

Module: sip-router
Branch: master
Commit: 45227df1bc87e448c74fe31c001e85f525c654a0
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45227df1bc87e448c74fe31c001e85f525c654a0

Author: Juha Heinanen <jh at tutpro.com>
Committer: Juha Heinanen <jh at tutpro.com>
Date:   Mon May 27 17:57:07 2013 +0300

modules/usrloc: renamed ul.users and ul.contacts rpc commands

- new, more descriptive names are ul.db_users and ul.db_contacts

---

 modules/usrloc/README               |   16 ++++++++--------
 modules/usrloc/doc/usrloc_admin.xml |    4 ++--
 modules/usrloc/ul_rpc.c             |   12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/usrloc/README b/modules/usrloc/README
index 02227b0..79448c3 100644
--- a/modules/usrloc/README
+++ b/modules/usrloc/README
@@ -87,8 +87,8 @@ Bogdan-Andrei Iancu
               6.4. ul.rm_contact table AOR contact
               6.5. ul.flush
               6.6. ul.add
-              6.7. ul.users
-              6.8. ul.contacts
+              6.7. ul.db_users
+              6.8. ul.db_contacts
 
         7. Statistics
 
@@ -223,8 +223,8 @@ Chapter 1. Admin Guide
         6.4. ul.rm_contact table AOR contact
         6.5. ul.flush
         6.6. ul.add
-        6.7. ul.users
-        6.8. ul.contacts
+        6.7. ul.db_users
+        6.8. ul.db_contacts
 
    7. Statistics
 
@@ -840,8 +840,8 @@ modparam("usrloc", "db_ops_ruid", 1)
    6.4. ul.rm_contact table AOR contact
    6.5. ul.flush
    6.6. ul.add
-   6.7. ul.users
-   6.8. ul.contacts
+   6.7. ul.db_users
+   6.8. ul.db_contacts
 
 6.1.  ul.dump
 
@@ -898,7 +898,7 @@ modparam("usrloc", "db_ops_ruid", 1)
      * cflags - per branch flags of the contact
      * methods - mask with supported requests of the contact
 
-6.7.  ul.users
+6.7.  ul.db_users
 
    Tell number of different users (AoRs) in a location table.
 
@@ -906,7 +906,7 @@ modparam("usrloc", "db_ops_ruid", 1)
      * table name - location table where the users are looked for, for
        example, location.
 
-6.8.  ul.contacts
+6.8.  ul.db_contacts
 
    Tell number of contacts in a location table.
 
diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml
index 7745ffe..8720471 100644
--- a/modules/usrloc/doc/usrloc_admin.xml
+++ b/modules/usrloc/doc/usrloc_admin.xml
@@ -1160,7 +1160,7 @@ modparam("usrloc", "db_ops_ruid", 1)
 
 	<section>
 		<title>
-		<function moreinfo="none">ul.users</function>
+		<function moreinfo="none">ul.db_users</function>
 		</title>
 		<para>
 		Tell number of different users (AoRs) in a location table.
@@ -1175,7 +1175,7 @@ modparam("usrloc", "db_ops_ruid", 1)
 
 	<section>
 		<title>
-		<function moreinfo="none">ul.contacts</function>
+		<function moreinfo="none">ul.db_contacts</function>
 		</title>
 		<para>
 		Tell number of contacts in a location table.
diff --git a/modules/usrloc/ul_rpc.c b/modules/usrloc/ul_rpc.c
index e0ebaf4..216d326 100644
--- a/modules/usrloc/ul_rpc.c
+++ b/modules/usrloc/ul_rpc.c
@@ -639,7 +639,7 @@ static const char* ul_rpc_add_doc[2] = {
 
 #define QUERY_LEN 256
 
-static void ul_rpc_users(rpc_t* rpc, void* ctx)
+static void ul_rpc_db_users(rpc_t* rpc, void* ctx)
 {
     str table = {0, 0};
     char query[QUERY_LEN];
@@ -689,12 +689,12 @@ static void ul_rpc_users(rpc_t* rpc, void* ctx)
     rpc->add(ctx, "d", count);
 }
 
-static const char* ul_rpc_users_doc[2] = {
+static const char* ul_rpc_db_users_doc[2] = {
 	"Tell number of different users (AoRs) in database table (db_mode!=0 only)",
 	0
 };
 
-static void ul_rpc_contacts(rpc_t* rpc, void* ctx)
+static void ul_rpc_db_contacts(rpc_t* rpc, void* ctx)
 {
     str table = {0, 0};
     char query[QUERY_LEN];
@@ -741,7 +741,7 @@ static void ul_rpc_contacts(rpc_t* rpc, void* ctx)
     rpc->add(ctx, "d", count);
 }
 
-static const char* ul_rpc_contacts_doc[2] = {
+static const char* ul_rpc_db_contacts_doc[2] = {
 	"Tell number of contacts in database table (db_mode=3 only)",
 	0
 };
@@ -753,8 +753,8 @@ rpc_export_t ul_rpc[] = {
 	{"ul.rm_contact", ul_rpc_rm_contact, ul_rpc_rm_contact_doc, 0},
 	{"ul.flush", ul_rpc_flush, ul_rpc_flush_doc, 0},
 	{"ul.add", ul_rpc_add, ul_rpc_add_doc, 0},
-	{"ul.users", ul_rpc_users, ul_rpc_users_doc, 0},
-	{"ul.contacts", ul_rpc_contacts, ul_rpc_contacts_doc, 0},
+	{"ul.db_users", ul_rpc_db_users, ul_rpc_db_users_doc, 0},
+	{"ul.db_contacts", ul_rpc_db_contacts, ul_rpc_db_contacts_doc, 0},
 	{0, 0, 0, 0}
 };